diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/base.go | 7 | ||||
| -rw-r--r-- | java/core-libraries/Android.bp | 4 | ||||
| -rw-r--r-- | java/dexpreopt_test.go | 13 | ||||
| -rw-r--r-- | java/sdk_library.go | 1 | ||||
| -rw-r--r-- | java/testing.go | 8 |
5 files changed, 3 insertions, 30 deletions
diff --git a/java/base.go b/java/base.go index e516891a3..4cd60215c 100644 --- a/java/base.go +++ b/java/base.go @@ -593,13 +593,6 @@ func (j *Module) InstallInProduct() bool { return j.ProductSpecific() } -var _ android.StubsAvailableModule = (*Module)(nil) - -// To safisfy the StubsAvailableModule interface -func (j *Module) IsStubsModule() bool { - return proptools.Bool(j.properties.Is_stubs_module) -} - func (j *Module) CheckStableSdkVersion(ctx android.BaseModuleContext) error { sdkVersion := j.SdkVersion(ctx) if sdkVersion.Stable() { diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp index 1cca7ad49..cee7a192e 100644 --- a/java/core-libraries/Android.bp +++ b/java/core-libraries/Android.bp @@ -38,7 +38,6 @@ java_defaults { visibility: ["//visibility:public"], sdk_version: "none", system_modules: "none", - is_stubs_module: true, } java_library { @@ -290,7 +289,6 @@ java_defaults { sdk_version: "none", system_modules: "none", patch_module: "java.base", - is_stubs_module: true, } // Same as legacy.core.platform.api.stubs, but android annotations are @@ -309,7 +307,6 @@ java_library { "legacy.core.platform.api.stubs", ], patch_module: "java.base", - is_stubs_module: true, } java_library { @@ -342,7 +339,6 @@ java_library { "stable.core.platform.api.stubs", ], patch_module: "java.base", - is_stubs_module: true, } // Used when compiling higher-level code against *.core.platform.api.stubs. diff --git a/java/dexpreopt_test.go b/java/dexpreopt_test.go index 07d0595e6..73e33f4fb 100644 --- a/java/dexpreopt_test.go +++ b/java/dexpreopt_test.go @@ -54,7 +54,6 @@ func TestDexpreoptEnabled(t *testing.T) { name: "foo", installable: true, srcs: ["a.java"], - sdk_version: "current", }`, enabled: true, }, @@ -99,7 +98,6 @@ func TestDexpreoptEnabled(t *testing.T) { java_library { name: "foo", installable: true, - sdk_version: "current", }`, enabled: false, }, @@ -109,7 +107,6 @@ func TestDexpreoptEnabled(t *testing.T) { java_library { name: "foo", srcs: ["a.java"], - sdk_version: "current", }`, enabled: false, }, @@ -147,7 +144,6 @@ func TestDexpreoptEnabled(t *testing.T) { name: "foo", srcs: ["a.java"], compile_dex: true, - sdk_version: "current", }`, enabled: false, }, @@ -168,7 +164,6 @@ func TestDexpreoptEnabled(t *testing.T) { installable: true, srcs: ["a.java"], apex_available: ["com.android.apex1"], - sdk_version: "current", }`, apexVariant: true, enabled: false, @@ -181,7 +176,6 @@ func TestDexpreoptEnabled(t *testing.T) { installable: true, srcs: ["a.java"], apex_available: ["com.android.apex1"], - sdk_version: "current", }`, moduleName: "service-foo", apexVariant: true, @@ -195,7 +189,6 @@ func TestDexpreoptEnabled(t *testing.T) { installable: true, srcs: ["a.java"], apex_available: ["com.android.apex1"], - sdk_version: "current", }`, moduleName: "prebuilt_service-foo", apexVariant: true, @@ -209,7 +202,6 @@ func TestDexpreoptEnabled(t *testing.T) { installable: true, srcs: ["a.java"], apex_available: ["com.android.apex1"], - sdk_version: "current", }`, moduleName: "service-foo", apexVariant: false, @@ -319,7 +311,6 @@ func TestDexpreoptBuiltInstalledForApex(t *testing.T) { installable: true, srcs: ["a.java"], apex_available: ["com.android.apex1"], - sdk_version: "current", }`) ctx := result.TestContext module := ctx.ModuleForTests("service-foo", "android_common_apex1000") @@ -351,7 +342,6 @@ func TestDexpreoptBuiltInstalledForApex(t *testing.T) { name: "foo", installable: true, srcs: ["a.java"], - sdk_version: "current", }`) ctx = result.TestContext module = ctx.ModuleForTests("foo", "android_common") @@ -408,7 +398,6 @@ func TestAndroidMkEntriesForApex(t *testing.T) { installable: true, srcs: ["a.java"], apex_available: ["com.android.apex1"], - sdk_version: "current", }`) ctx := result.TestContext module := ctx.ModuleForTests("service-foo", "android_common_apex1000") @@ -440,7 +429,6 @@ func TestAndroidMkEntriesForApex(t *testing.T) { name: "foo", installable: true, srcs: ["a.java"], - sdk_version: "current", }`) ctx = result.TestContext module = ctx.ModuleForTests("foo", "android_common") @@ -466,7 +454,6 @@ func TestGenerateProfileEvenIfDexpreoptIsDisabled(t *testing.T) { profile: "art-profile", }, srcs: ["a.java"], - sdk_version: "current", }`) ctx := result.TestContext diff --git a/java/sdk_library.go b/java/sdk_library.go index a7a254af8..25317c50d 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -2099,7 +2099,6 @@ func (module *SdkLibrary) topLevelStubsLibraryProps(mctx android.DefaultableHook props.Dist.Dir = proptools.StringPtr(module.apiDistPath(apiScope)) props.Dist.Tag = proptools.StringPtr(".jar") } - props.Is_stubs_module = proptools.BoolPtr(true) return props } diff --git a/java/testing.go b/java/testing.go index 03dcee667..0e85022ce 100644 --- a/java/testing.go +++ b/java/testing.go @@ -184,10 +184,6 @@ var PrepareForTestWithJacocoInstrumentation = android.GroupFixturePreparers( host_supported: true, srcs: ["Test.java"], sdk_version: "current", - apex_available: [ - "//apex_available:anyapex", - "//apex_available:platform", - ], } `)), ) @@ -412,6 +408,7 @@ func gatherRequiredDepsForTest() string { "core.current.stubs", "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs", + "android_stubs_current_exportable", "android_system_stubs_current_exportable", "android_test_stubs_current_exportable", @@ -419,11 +416,13 @@ func gatherRequiredDepsForTest() string { "android_system_server_stubs_current_exportable", "core.current.stubs.exportable", "legacy.core.platform.api.stubs.exportable", + "kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8", "kotlin-annotations", "stub-annotations", + "aconfig-annotations-lib", "unsupportedappusage", } @@ -436,7 +435,6 @@ func gatherRequiredDepsForTest() string { sdk_version: "none", system_modules: "stable-core-platform-api-stubs-system-modules", compile_dex: true, - is_stubs_module: true, } `, extra) } |