From 109029fb5c0eb7f9c8263223adff063bb6d6ff03 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 3 Oct 2018 18:22:57 -0700 Subject: [PATCH] Define HWADDRESS_SANITIZER_GLOBAL_OPTIONS. It will be exported in device environment as HWASAN_OPTIONS. Bug: 112438058 Test: none Change-Id: I574b46060b3193c9f2351116a91ebc35470ae803 --- cc/makevars.go | 1 + cc/sanitize.go | 1 + 2 files changed, 2 insertions(+) diff --git a/cc/makevars.go b/cc/makevars.go index 993b2a8ba..b59078609 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -126,6 +126,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES", strings.Join(asanLibs, " ")) ctx.Strict("HWADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(hwasanCflags, " ")) + ctx.Strict("HWADDRESS_SANITIZER_GLOBAL_OPTIONS", strings.Join(hwasanGlobalOptions, ",")) ctx.Strict("CFI_EXTRA_CFLAGS", strings.Join(cfiCflags, " ")) ctx.Strict("CFI_EXTRA_ASFLAGS", strings.Join(cfiAsflags, " ")) diff --git a/cc/sanitize.go b/cc/sanitize.go index 3fef6a8d0..330a5e3a7 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -52,6 +52,7 @@ var ( intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"} minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined", "-fno-sanitize-recover=integer,undefined"} + hwasanGlobalOptions = []string{"heap_history_size=4095"} ) type sanitizerType int