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

Skip product variant for core-variant VNDK am: 31094b10d2 am: 05f5613573

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1534833

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91a93e47ba1c64f813eee8bbaec3595e4150a3fa
This commit is contained in:
Justin Yun
2020-12-24 09:03:43 +00:00
committed by Automerger Merge Worker
parent 856b3dee70 05f5613573
commit ee4a7c8ece
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/library.go
View File

@@ -1400,8 +1400,9 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
}
}
// In some cases we want to use core variant for VNDK-Core libs
if ctx.isVndk() && !ctx.isVndkSp() && !ctx.IsVndkExt() {
// In some cases we want to use core variant for VNDK-Core libs.
// Skip product variant since VNDKs use only the vendor variant.
if ctx.isVndk() && !ctx.isVndkSp() && !ctx.IsVndkExt() && !ctx.inProduct() {
mayUseCoreVariant := true
if ctx.mustUseVendorVariant() {