commit 3c5ee5d6f2f50895611eacd71a62b11efcfb0648
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 12 08:12:29 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 12 08:12:29 2019 +0000
tree 14f5618ff219f9c077ad59268251b1b373095432
parent 4402d5d4938cfd94966417287bc6da315b1a9605
parent 056f4c0630e9374158768f0fb3be3abcc90b93c2

Merge "Fix sanitizer-status for hwasan builds"

sanitizer-status/sanitizer-status.c

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 @@
   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

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