diff options
| -rw-r--r-- | apex/apex.go | 1 | ||||
| -rw-r--r-- | cc/linker.go | 11 | ||||
| -rw-r--r-- | cc/sanitize.go | 10 |
3 files changed, 0 insertions, 22 deletions
diff --git a/apex/apex.go b/apex/apex.go index e308d488f..58cbb13e9 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -369,7 +369,6 @@ func makeApexAvailableBaseline() map[string][]string { "libbinderthreadstateutils", "libbluetooth-types-header", "libbufferhub_headers", - "libc_scudo", "libcodec2", "libcodec2_headers", "libcodec2_hidl@1.0", diff --git a/cc/linker.go b/cc/linker.go index c9cbd9baf..58f8a294e 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -298,17 +298,6 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { } } - if inList("libc_scudo", deps.SharedLibs) { - // libc_scudo is an alternate implementation of all - // allocation functions (malloc, free), that uses - // the scudo allocator instead of the default native - // allocator. If this library is in the list, make - // sure it's first so it properly overrides the - // allocation functions of all other shared libraries. - _, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs) - deps.SharedLibs = append([]string{"libc_scudo"}, deps.SharedLibs...) - } - // If libc and libdl are both in system_shared_libs make sure libdl comes after libc // to avoid loading libdl before libc. if inList("libdl", systemSharedLibs) && inList("libc", systemSharedLibs) && diff --git a/cc/sanitize.go b/cc/sanitize.go index aaaf694d9..72ad6d7a0 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -408,16 +408,6 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps { return deps } - if ctx.Device() { - if Bool(sanitize.Properties.Sanitize.Address) { - // 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 - // allocation functions which asan already overrides. - _, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs) - } - } - return deps } |