Merge "Don't check library variant identicalness for VNDK extensions"

This commit is contained in:
Steven Laver
2020-01-29 21:26:48 +00:00
committed by Gerrit Code Review

View File

@@ -1104,7 +1104,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
if ctx.isVndkSp() {
library.baseInstaller.subDir = "vndk-sp"
} else if ctx.isVndk() {
if !ctx.mustUseVendorVariant() {
if !ctx.mustUseVendorVariant() && !ctx.isVndkExt() {
library.checkSameCoreVariant = true
if ctx.DeviceConfig().VndkUseCoreVariant() {
library.useCoreVariant = true