Ignore some prebuilt vndk libs for trunk-stable next

Source tree may include prebuilt vndk snapshot libs that are newer
than or equal to the PLATFORM_VNDK_VERSION.
Ignore those prebuilt vndk snapshot libs.

Bug: 296488609
Test: lunch cf_x86_64_phone-next-userdebug; m nothing
Change-Id: I3adaf3b7636f53884f08540959d2ec2fddfb6921
This commit is contained in:
Justin Yun
2023-08-18 17:51:14 +09:00
parent c21f48def3
commit f14beafb7c
3 changed files with 21 additions and 3 deletions

View File

@@ -80,6 +80,10 @@ func apexVndkMutator(mctx android.TopDownMutatorContext) {
// config targets the 'current' VNDK (see `vndkVersion`).
ab.Disable()
}
if proptools.String(ab.vndkProperties.Vndk_version) != "" &&
apiLevel.GreaterThanOrEqualTo(android.ApiLevelOrPanic(mctx, mctx.DeviceConfig().PlatformVndkVersion())) {
ab.Disable()
}
}
}