tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove libc_scudo references.

Browse source 
Test: Builds and boots.
Change-Id: Iad97159e6193f7afffd8fbc9456427eee5d150e3
Merged-In: Iad97159e6193f7afffd8fbc9456427eee5d150e3
(cherry picked from commit 1f16b27511)
This commit is contained in:
Christopher Ferris 2020-06-08 16:20:52 -07:00
parent ea34d87759
commit f70926eef0
3 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apex/apex.go
View file

@ -369,7 +369,6 @@ func makeApexAvailableBaseline() map[string][]string {
"libbinderthreadstateutils",
"libbluetooth-types-header",
"libbufferhub_headers",
"libc_scudo",
"libcodec2",
"libcodec2_headers",
"libcodec2_hidl@1.0",

11
cc/linker.go
View file

@ -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) &&

10
cc/sanitize.go
View file

@ -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
}