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

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

View file

@ -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
}
}