From a6302337c89a09b480f6704eb8fc6f5360c7cc92 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Tue, 28 Aug 2018 13:51:05 -0700 Subject: [PATCH] Pass hwasan extra cflags to make. Bug: 112438058 Test: SANITIZE_TARGET=hwaddress Change-Id: If57e5f4cf78037992936ce94a98f017676b7e74b --- cc/makevars.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cc/makevars.go b/cc/makevars.go index 5b9ac1dc6..c4ef5f1e5 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -127,6 +127,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 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, " "))