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 "Add sanitizer runtime library to recovery when needed."

This commit is contained in:
Treehugger Robot 2018-12-03 20:42:37 +00:00 committed by Gerrit Code Review
parent 89df00c216 98f5b0642c
commit 5b46a085d7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cc/sanitize.go
View File

@ -49,7 +49,7 @@ var (
cfiStaticLibsMutex sync.Mutex cfiStaticLibsMutex sync.Mutex
hwasanStaticLibsMutex sync.Mutex hwasanStaticLibsMutex sync.Mutex
intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"} intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"}
// Pass -Xclang before -fsanitize-minimal-runtime to work around a driver // Pass -Xclang before -fsanitize-minimal-runtime to work around a driver
// check which rejects -fsanitize-minimal-runtime together with // check which rejects -fsanitize-minimal-runtime together with
@ -576,9 +576,12 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
sanitize.runtimeLibrary = runtimeLibrary sanitize.runtimeLibrary = runtimeLibrary
// When linking against VNDK, use the vendor variant of the runtime lib // When linking against VNDK, use the vendor variant of the runtime lib
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary
if ctx.useVndk() { if ctx.useVndk() {
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary + vendorSuffix sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary + vendorSuffix
} else if ctx.inRecovery() {
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary + recoverySuffix
} else {
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary
} }
} }