Merge "Add sanitizer runtime library to recovery when needed."
am: 5b46a085d7
Change-Id: I7115159d4bd3eb88636699c4164fabe07501554f
This commit is contained in:
commit
792684273d
1 changed files with 5 additions and 2 deletions
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue