diff options
author | Christopher Ferris | 2019-05-13 19:12:33 -0500 |
---|---|---|
committer | Gerrit Code Review | 2019-05-13 19:12:33 -0500 |
commit | d7e66d9e7c9aee970f0e3c55f2cc2768794e286f (patch) | |
tree | 98e89ec686c769a47a6f1799fc462a8bad339cd7 /cc | |
parent | f3e802bf0df27a7af9da285439108d5eff1e9a84 (diff) | |
parent | 753d4a69d55bf7492e3c4bf193c3a906dcb23535 (diff) | |
download | platform-build-soong-d7e66d9e7c9aee970f0e3c55f2cc2768794e286f.tar.gz platform-build-soong-d7e66d9e7c9aee970f0e3c55f2cc2768794e286f.tar.xz platform-build-soong-d7e66d9e7c9aee970f0e3c55f2cc2768794e286f.zip |
Merge "Remove libc_scudo library when building asan."
Diffstat (limited to 'cc')
-rw-r--r-- | cc/sanitize.go | 5 |
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 | ||