Snap for 5304721 from 3c5ee5d6 to qt-release

Change-Id: Ica1d8a973230ac0e5f57502d7dc581067f9b401b

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

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")
 	}