StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove libc_scudo references." am: a5d1fab176

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326235

Change-Id: I9ce436ca9c2af9e6df2e280ec73253228f79652b
This commit is contained in:
Christopher Ferris
2020-06-24 03:27:19 +00:00
committed by Automerger Merge Worker
parent 74a88dd404 a5d1fab176
commit f25abb1d01
3 changed files with 0 additions and 22 deletions
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", "libbinderthreadstateutils",
"libbluetooth-types-header", "libbluetooth-types-header",
"libbufferhub_headers", "libbufferhub_headers",
"libc_scudo",
"libcodec2", "libcodec2",
"libcodec2_headers", "libcodec2_headers",
"libcodec2_hidl@1.0", "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 // If libc and libdl are both in system_shared_libs make sure libdl comes after libc
// to avoid loading libdl before libc. // to avoid loading libdl before libc.
if inList("libdl", systemSharedLibs) && inList("libc", systemSharedLibs) && 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 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 return deps
} }