Merge "Treat core_platform as stable unless module uses legacy"

2021-03-15 08:42:43 +00:00
parent aa52d66cd5 043f5e7881
commit fb856f6add
3 changed files with 21 additions and 5 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -122,7 +122,16 @@ func (j *Module) CheckStableSdkVersion() error {
 	if sdkVersion.stable() {
 		return nil
 	}
-	return fmt.Errorf("non stable SDK %v", sdkVersion)
+	if sdkVersion.kind == sdkCorePlatform {
+		if useLegacyCorePlatformApiByName(j.BaseModuleName()) {
+			return fmt.Errorf("non stable SDK %v - uses legacy core platform", sdkVersion)
+		} else {
+			// Treat stable core platform as stable.
+			return nil
+		}
+	} else {
+		return fmt.Errorf("non stable SDK %v", sdkVersion)
+	}
 }

 func (j *Module) checkSdkVersions(ctx android.ModuleContext) {