commit a6302337c89a09b480f6704eb8fc6f5360c7cc92
author Evgenii Stepanov <eugenis@google.com> Tue Aug 28 13:51:05 2018 -0700
committer Evgenii Stepanov <eugenis@google.com> Tue Aug 28 13:51:05 2018 -0700
tree 339a44640fd6f7dea54dc9d0a6b87834b331bce1
parent 4b42edbca0d68c7d332458bda7656f0b9370ea74

Pass hwasan extra cflags to make.

Bug: 112438058
Test: SANITIZE_TARGET=hwaddress
Change-Id: If57e5f4cf78037992936ce94a98f017676b7e74b

cc/makevars.go

diff --git a/cc/makevars.go b/cc/makevars.go
index 5b9ac1d..c4ef5f1 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -127,6 +127,8 @@
 	ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS", strings.Join(asanLdflags, " "))
 	ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES", strings.Join(asanLibs, " "))
 
+	ctx.Strict("HWADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(hwasanCflags, " "))
+
 	ctx.Strict("CFI_EXTRA_CFLAGS", strings.Join(cfiCflags, " "))
 	ctx.Strict("CFI_EXTRA_LDFLAGS", strings.Join(cfiLdflags, " "))