Merge "Enable VNDK when version matches platform VNDK"

This commit is contained in:
Prashanth Swaminathan
2023-03-17 02:46:00 +00:00
committed by Gerrit Code Review

View File

@@ -72,12 +72,14 @@ func apexVndkMutator(mctx android.TopDownMutatorContext) {
} }
targets := mctx.MultiTargets() targets := mctx.MultiTargets()
if len(targets) > 0 && apiLevel.LessThan(cc.MinApiForArch(mctx, targets[0].Arch.ArchType)) { 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 vndkVersion != mctx.DeviceConfig().PlatformVndkVersion() {
// architecture. // 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() ab.Disable()
} }
} }
} }