diff options
Diffstat (limited to 'java/sdk_library_test.go')
| -rw-r--r-- | java/sdk_library_test.go | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/java/sdk_library_test.go b/java/sdk_library_test.go index a8a1494ee..f9c3dd5eb 100644 --- a/java/sdk_library_test.go +++ b/java/sdk_library_test.go @@ -35,9 +35,6 @@ func TestJavaSdkLibrary(t *testing.T) { "29": {"foo"}, "30": {"bar", "barney", "baz", "betty", "foo", "fred", "quuz", "wilma"}, }), - android.FixtureModifyConfig(func(config android.Config) { - config.SetApiLibraries([]string{"foo"}) - }), android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.BuildFlags = map[string]string{ "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", @@ -1588,9 +1585,6 @@ func TestJavaSdkLibrary_ApiLibrary(t *testing.T) { prepareForJavaTest, PrepareForTestWithJavaSdkLibraryFiles, FixtureWithLastReleaseApis("foo"), - android.FixtureModifyConfig(func(config android.Config) { - config.SetApiLibraries([]string{"foo"}) - }), ).RunTestWithBp(t, ` java_sdk_library { name: "foo", @@ -1609,36 +1603,30 @@ func TestJavaSdkLibrary_ApiLibrary(t *testing.T) { `) testCases := []struct { - scope *apiScope - apiContributions []string - fullApiSurfaceStub string + scope *apiScope + apiContributions []string }{ { - scope: apiScopePublic, - apiContributions: []string{"foo.stubs.source.api.contribution"}, - fullApiSurfaceStub: "android_stubs_current", + scope: apiScopePublic, + apiContributions: []string{"foo.stubs.source.api.contribution"}, }, { - scope: apiScopeSystem, - apiContributions: []string{"foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, - fullApiSurfaceStub: "android_system_stubs_current", + scope: apiScopeSystem, + apiContributions: []string{"foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, }, { - scope: apiScopeTest, - apiContributions: []string{"foo.stubs.source.test.api.contribution", "foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, - fullApiSurfaceStub: "android_test_stubs_current", + scope: apiScopeTest, + apiContributions: []string{"foo.stubs.source.test.api.contribution", "foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, }, { - scope: apiScopeModuleLib, - apiContributions: []string{"foo.stubs.source.module_lib.api.contribution", "foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, - fullApiSurfaceStub: "android_module_lib_stubs_current_full.from-text", + scope: apiScopeModuleLib, + apiContributions: []string{"foo.stubs.source.module_lib.api.contribution", "foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, }, } for _, c := range testCases { m := result.ModuleForTests(c.scope.apiLibraryModuleName("foo"), "android_common").Module().(*ApiLibrary) android.AssertArrayString(t, "Module expected to contain api contributions", c.apiContributions, m.properties.Api_contributions) - android.AssertStringEquals(t, "Module expected to contain full api surface api library", c.fullApiSurfaceStub, *m.properties.Full_api_surface_stub) } } @@ -1708,9 +1696,6 @@ func TestSdkLibraryExportableStubsLibrary(t *testing.T) { prepareForJavaTest, PrepareForTestWithJavaSdkLibraryFiles, FixtureWithLastReleaseApis("foo"), - android.FixtureModifyConfig(func(config android.Config) { - config.SetApiLibraries([]string{"foo"}) - }), ).RunTestWithBp(t, ` aconfig_declarations { name: "bar", |