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

Commit 0ca0dd8e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove HWADDRESS_SANITIZER_GLOBAL_OPTIONS" into main

parents 3bec2a77 af2994cc

cc/makevars.go

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

cc/sanitize.go

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