diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2021-03-15 08:42:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-15 08:42:43 +0000 |
| commit | fb856f6add96555ef2912aec4c883174f9cfda64 (patch) | |
| tree | c6e861b99649687b35b2047979089250b65b025c /java/java.go | |
| parent | aa52d66cd572d2cc62573078c02cad062e7ddeb5 (diff) | |
| parent | 043f5e78811df7cff70aeefec99e7f8172bf48ab (diff) | |
Merge "Treat core_platform as stable unless module uses legacy"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 567ebbbe5..036c7afd4 100644 --- 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) { |