StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 7a833bdf2b

Change-Id: I6480d2334ed77702e73c9036f6d530aed2ba78bb
This commit is contained in:
Steven Laver
2020-01-29 13:40:36 -08:00
committed by android-build-merger
parent f9884fc658 7a833bdf2b
commit 3bd0c2a219
1 changed files with 1 additions and 1 deletions
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() { if ctx.isVndkSp() {
library.baseInstaller.subDir = "vndk-sp" library.baseInstaller.subDir = "vndk-sp"
} else if ctx.isVndk() { } else if ctx.isVndk() {
if !ctx.mustUseVendorVariant() { if !ctx.mustUseVendorVariant() && !ctx.isVndkExt() {
library.checkSameCoreVariant = true library.checkSameCoreVariant = true
if ctx.DeviceConfig().VndkUseCoreVariant() { if ctx.DeviceConfig().VndkUseCoreVariant() {
library.useCoreVariant = true library.useCoreVariant = true