openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Append ".static" to ubsan runtime for static binaries" am: e2f39b038d am: c1f3f6acbc 

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

Change-Id: Ib5dc63f70e94dff91ea9f3deae6e4e962a55cc8c
This commit is contained in:
Treehugger Robot 2021-03-30 04:18:17 +00:00 committed by Automerger Merge Worker
parent 78dd45f054 c1f3f6acbc
commit 8b81b2b528
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cc/sanitize.go
View File

@ -1129,6 +1129,9 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
Bool(c.sanitize.Properties.Sanitize.Undefined) ||
Bool(c.sanitize.Properties.Sanitize.All_undefined) {
runtimeLibrary = config.UndefinedBehaviorSanitizerRuntimeLibrary(toolchain)
if c.staticBinary() {
runtimeLibrary += ".static"
}
}
if runtimeLibrary != "" && (toolchain.Bionic() || c.sanitize.Properties.UbsanRuntimeDep) {