aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris2019-05-13 19:27:53 -0500
committerandroid-build-merger2019-05-13 19:27:53 -0500
commit486b170bbc9b579ecd609ab216345500d141ccfd (patch)
tree98e89ec686c769a47a6f1799fc462a8bad339cd7
parent9a7ee9da1b27f4e762c6e6593c56c33d56d48066 (diff)
parentd7e66d9e7c9aee970f0e3c55f2cc2768794e286f (diff)
downloadplatform-build-soong-486b170bbc9b579ecd609ab216345500d141ccfd.tar.gz
platform-build-soong-486b170bbc9b579ecd609ab216345500d141ccfd.tar.xz
platform-build-soong-486b170bbc9b579ecd609ab216345500d141ccfd.zip
Merge "Remove libc_scudo library when building asan."
am: d7e66d9e7c Change-Id: Ib422be5e7d9010f26e65da3ccbcd0f9755ac6108
-rw-r--r--cc/sanitize.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go
index acf2befd..4486d2ef 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -392,6 +392,11 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps {
392 if ctx.Device() { 392 if ctx.Device() {
393 if Bool(sanitize.Properties.Sanitize.Address) { 393 if Bool(sanitize.Properties.Sanitize.Address) {
394 deps.StaticLibs = append(deps.StaticLibs, asanLibs...) 394 deps.StaticLibs = append(deps.StaticLibs, asanLibs...)
395 // Compiling asan and having libc_scudo in the same
396 // executable will cause the executable to crash.
397 // Remove libc_scudo since it is only used to override
398 // allocation functions which asan already overrides.
399 _, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs)
395 } 400 }
396 } 401 }
397 402