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

Merge "Don't check library variant identicalness for VNDK extensions" am: 7a833bdf2b am: 3bd0c2a219 am: 54df290daa

Browse source 
Change-Id: I93652a1ac4bd66c6c294f64280df4a40f3155020
This commit is contained in:
Automerger Merge Worker 2020-01-29 22:03:12 +00:00
commit 14c4f427a3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cc/library.go
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