From af2994ccb609b27d0a5f0a6881a64d18c0f4dd7c Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 1 Aug 2024 10:27:31 +0900 Subject: [PATCH] Remove HWADDRESS_SANITIZER_GLOBAL_OPTIONS It doesn't need to be a Makefile variable exported from Soong as it's hard-coded. Bug: 353429422 Test: boot shiba with SANITIZE_TARGET=hwaddress Change-Id: I4a98eaaf1002aa7aba5d5131ff251bdcbdd2e0ef --- cc/makevars.go | 1 - cc/sanitize.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/cc/makevars.go b/cc/makevars.go index cd1396521..c9352a4ad 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -140,7 +140,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(asanCflags, " ")) 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 64a313bc2..7b0652c38 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -79,8 +79,6 @@ var ( minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined", "-fno-sanitize-recover=integer,undefined"} - hwasanGlobalOptions = []string{"heap_history_size=1023", "stack_history_size=512", - "export_memory_stats=0", "max_malloc_fill_size=131072", "malloc_fill_byte=0"} memtagStackCommonFlags = []string{"-march=armv8-a+memtag"} memtagStackLlvmFlags = []string{"-dom-tree-reachability-max-bbs-to-explore=128"}