Snap for 5304721 from 3c5ee5d6f2f50895611eacd71a62b11efcfb0648 to qt-releaseandroid-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi

Change-Id: Ica1d8a973230ac0e5f57502d7dc581067f9b401b

2 files changed, 4 insertions, 1 deletions

diff --git a/sanitizer-status/sanitizer-status.c b/sanitizer-status/sanitizer-status.c
index 3f8f350..41af3f8 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 9154e22..2c75e9f 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")
 	}