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

Merge "Build VNDK APEX for VNDK-Lite" into rvc-dev am: 3978d03fb7

Browse Source 
Change-Id: Idfbf9f998c7a8228a8b873274a91bca72b9f71f5
This commit is contained in:
Jooyung Han
2020-04-07 17:06:56 +00:00
committed by Automerger Merge Worker
parent 1a542748f9 3978d03fb7
commit 72e5c957d4
3 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/vndk.go
View File

@@ -350,6 +350,15 @@ func IsForVndkApex(mctx android.BottomUpMutatorContext, m *Module) bool {
}
if lib, ok := m.linker.(libraryInterface); ok {
// VNDK APEX for VNDK-Lite devices will have VNDK-SP libraries from core variants
if mctx.DeviceConfig().VndkVersion() == "" {
// b/73296261: filter out libz.so because it is considered as LLNDK for VNDK-lite devices
if mctx.ModuleName() == "libz" {
return false
}
return m.ImageVariation().Variation == android.CoreVariation && lib.shared() && m.isVndkSp()
}
useCoreVariant := m.VndkVersion() == mctx.DeviceConfig().PlatformVndkVersion() &&
mctx.DeviceConfig().VndkUseCoreVariant() && !m.MustUseVendorVariant()
return lib.shared() && m.inVendor() && m.IsVndk() && !m.isVndkExt() && !useCoreVariant