diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index 9e3583501..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) { @@ -2499,7 +2508,7 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) { func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { if j.testProperties.Test_options.Unit_test == nil && ctx.Host() { // TODO(b/): Clean temporary heuristic to avoid unexpected onboarding. - defaultUnitTest := !inList("tradefed", j.properties.Static_libs) && !inList("tradefed", j.properties.Libs) && !inList("cts", j.testProperties.Test_suites) && !inList("robolectric-host-android_all", j.properties.Static_libs) && !inList("robolectric-host-android_all", j.properties.Libs) + defaultUnitTest := !inList("tradefed", j.properties.Static_libs) && !inList("tradefed", j.properties.Libs) && !inList("cts", j.testProperties.Test_suites) j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest) } j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template, @@ -3319,10 +3328,6 @@ type Defaults struct { // ], // javacflags: ["-Xlint:all"], // } -func defaultsFactory() android.Module { - return DefaultsFactory() -} - func DefaultsFactory() android.Module { module := &Defaults{} |