diff --git a/sanitizer-status/sanitizer-status.c b/sanitizer-status/sanitizer-status.c
index 3f8f350b321b8aac900ecc70adad0af38f683620..41af3f83e0d922cb8a385346f60b6969d2120d33 100644
--- a/sanitizer-status/sanitizer-status.c
+++ b/sanitizer-status/sanitizer-status.c
@@ -143,7 +143,7 @@ int sanitizer_status(int argc, const char** argv) {
   if (test_everything || have_option("asan", argv, argc)) {
     int asan_failures = 0;
 
-#ifndef ANDROID_SANITIZE_ADDRESS
+#if !defined(ANDROID_SANITIZE_ADDRESS) && !defined(ANDROID_SANITIZE_HWADDRESS)
     asan_failures += 1;
     printf("ASAN: Compiler flags failed!\n");
 #endif
diff --git a/sanitizer-status/sanitizer-status.go b/sanitizer-status/sanitizer-status.go
index 9154e221cb38bbfe97e3cf1457234d76e28544dc..2c75e9f24f341f70e80789b1c104521d449d5234 100644
--- a/sanitizer-status/sanitizer-status.go
+++ b/sanitizer-status/sanitizer-status.go
@@ -28,6 +28,9 @@ func loadHook(ctx android.LoadHookContext) {
 	if android.InList("address", sanitizers) {
 		p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_ADDRESS=1")
 	}
+	if android.InList("hwaddress", sanitizers) {
+		p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_HWADDRESS=1")
+	}
 	if android.InList("coverage", sanitizers) {
 		p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_COVERAGE=1")
 	}