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

Commit 48d07678 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Remove asanLibs." am: 63034235 

am: 233d006e

Change-Id: Ie3008d566ce9f57c1791fb330cb0567d3240bd2a
parents 1c9d8c9e 233d006e

cc/makevars.go

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 


	ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(asanCflags, " "))

	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("HWADDRESS_SANITIZER_GLOBAL_OPTIONS", strings.Join(hwasanGlobalOptions, ","))

cc/sanitize.go

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ var ( 


	asanCflags  = []string{"-fno-omit-frame-pointer"}

	asanLdflags = []string{"-Wl,-u,__asan_preinit"}

	asanLibs    = []string{"libasan"}



	// TODO(pcc): Stop passing -hwasan-allow-ifunc here once it has been made

	// the default.
@@ -392,7 +391,6 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps { 


	if ctx.Device() {

		if Bool(sanitize.Properties.Sanitize.Address) {

			deps.StaticLibs = append(deps.StaticLibs, asanLibs...)

			// Compiling asan and having libc_scudo in the same

			// executable will cause the executable to crash.

			// Remove libc_scudo since it is only used to override