Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 109029fb authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

Define HWADDRESS_SANITIZER_GLOBAL_OPTIONS. 

It will be exported in device environment as HWASAN_OPTIONS.

Bug: 112438058
Test: none
Change-Id: I574b46060b3193c9f2351116a91ebc35470ae803
parent d054c225

cc/makevars.go

+1 −0
Original line number Diff line number Diff line
@@ -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, " "))

cc/sanitize.go

+1 −0
Original line number Diff line number Diff line
@@ -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