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

Merge "Remove libc_scudo library when building asan."

Browse Source
This commit is contained in:
Christopher Ferris
2019-05-14 00:12:33 +00:00
committed by Gerrit Code Review
parent f3e802bf0d 753d4a69d5
commit d7e66d9e7c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/sanitize.go
View File

@@ -392,6 +392,11 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps {
if ctx.Device() { if ctx.Device() {
if Bool(sanitize.Properties.Sanitize.Address) { if Bool(sanitize.Properties.Sanitize.Address) {
deps.StaticLibs = append(deps.StaticLibs, asanLibs...) 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
// allocation functions which asan already overrides.
_, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs)
} }
} }