Merge "Ignore some prebuilt vndk libs for trunk-stable next" into main

2023-08-18 17:51:23 +00:00
parent fd7870f231 f14beafb7c
commit 655ad9a236
3 changed files with 21 additions and 3 deletions
--- a/apex/vndk.go
+++ b/apex/vndk.go
@@ -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()
+		}
 	}
 }