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

Merge "Enable VNDK when version matches platform VNDK" am: bdc99964cf

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

Change-Id: I8db8063e7994f1ec8f703d1432bec0e0ac44b30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Prashanth Swaminathan
2023-03-17 02:55:34 +00:00
committed by Automerger Merge Worker
parent f4709bf419 bdc99964cf
commit 5192fdd8f6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/vndk.go
View File

@@ -72,12 +72,14 @@ func apexVndkMutator(mctx android.TopDownMutatorContext) {
}
targets := mctx.MultiTargets()
if len(targets) > 0 && apiLevel.LessThan(cc.MinApiForArch(mctx, targets[0].Arch.ArchType)) {
// Disable VNDK apexes for VNDK versions less than the minimum supported API level for the primary
// architecture.
if len(targets) > 0 && apiLevel.LessThan(cc.MinApiForArch(mctx, targets[0].Arch.ArchType)) &&
vndkVersion != mctx.DeviceConfig().PlatformVndkVersion() {
// Disable VNDK APEXes for VNDK versions less than the minimum supported API
// level for the primary architecture. This validation is skipped if the VNDK
// version matches the platform VNDK version, which can occur when the device
// config targets the 'current' VNDK (see `vndkVersion`).
ab.Disable()
}
}
}