From 55a18ba71a4b597686c587fd34853febd8bbdb15 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 19 Jul 2019 11:15:12 -0700 Subject: [PATCH] Remove asanLibs. We already link the shared prebuilt from the toolchain. This is redundant and the wrong version. Test: make checkbuild Bug: http://b/74067984 Change-Id: I4b5d23514158eebfb4eea2aa6761e076131c3224 --- cc/makevars.go | 1 - cc/sanitize.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/cc/makevars.go b/cc/makevars.go index 78a32c8b3..2b49772e2 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -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, ",")) diff --git a/cc/sanitize.go b/cc/sanitize.go index c59f53a04..b238b7e53 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -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. @@ -391,7 +390,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