From 056f4c0630e9374158768f0fb3be3abcc90b93c2 Mon Sep 17 00:00:00 2001
From: Zach Riggle <riggle@google.com>
Date: Fri, 8 Feb 2019 21:00:40 -0600
Subject: [PATCH] Fix sanitizer-status for hwasan builds
Specfiically, we need to handle SANITIZE_TARGET=hwaddress
Change-Id: Id2b03ae37ca6877256b795af770416e9ffee29c6
---
sanitizer-status/sanitizer-status.c | 2 +-
sanitizer-status/sanitizer-status.go | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
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")
}
--
GitLab