diff --git a/rules/apk_packaging.bzl b/rules/apk_packaging.bzl
index 7fe1896..f222bb0 100644
--- a/rules/apk_packaging.bzl
+++ b/rules/apk_packaging.bzl
@@ -238,6 +238,16 @@
             resources.append(native_lib)
             resource_paths.append(path)
 
+    if "hwasan" in ctx.features:
+        wrap_sh = ctx.actions.declare_file(ctx.label.name + "_hwasan_wrap.sh")
+        ctx.actions.write(
+            output = wrap_sh,
+            content = "#!/system/bin/sh\nLD_HWASAN=1 exec \"$@\"\n",
+            is_executable = True,
+        )
+        resources.append(wrap_sh)
+        resource_paths.append("%s:lib/arm64-v8a/wrap.sh" % wrap_sh.path)
+
     java.singlejar(
         ctx,
         inputs = inputs,
diff --git a/rules/resources.bzl b/rules/resources.bzl
index c547ffd..0362cc2 100644
--- a/rules/resources.bzl
+++ b/rules/resources.bzl
@@ -788,7 +788,7 @@
         aapt = aapt,
         busybox = busybox,
         host_javabase = host_javabase,
-        debug = compilation_mode != _compilation_mode.OPT,
+        debug = (compilation_mode != _compilation_mode.OPT) or ("hwasan" in ctx.features),
         should_throw_on_conflict = should_throw_on_conflict,
     )