tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add sanitizer runtime library to recovery when needed."

Browse source 
am: 5b46a085d7

Change-Id: I7115159d4bd3eb88636699c4164fabe07501554f
This commit is contained in:
Evgenii Stepanov 2018-12-03 13:53:18 -08:00 committed by android-build-merger
commit 792684273d
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
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
// check which rejects -fsanitize-minimal-runtime together with
@ -576,9 +576,12 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
sanitize.runtimeLibrary = runtimeLibrary
// When linking against VNDK, use the vendor variant of the runtime lib
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary
if ctx.useVndk() {
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary + vendorSuffix
} else if ctx.inRecovery() {
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary + recoverySuffix
} else {
sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary
}
}