StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-15 18:31:21 +00:00
committed by Gerrit Code Review
parent 3625faffc7 e7ee256746
commit f5ee8e3ffc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/sdk_library.go
View File

@@ -1853,7 +1853,7 @@ func (module *SdkLibrary) createApiLibrary(mctx android.DefaultableHookContext,
props.Libs = append(props.Libs, module.sdkLibraryProperties.Stub_only_libs...) props.Libs = append(props.Libs, module.sdkLibraryProperties.Stub_only_libs...)
props.Libs = append(props.Libs, "stub-annotations") props.Libs = append(props.Libs, "stub-annotations")
props.Static_libs = module.sdkLibraryProperties.Stub_only_static_libs props.Static_libs = module.sdkLibraryProperties.Stub_only_static_libs
props.Full_api_surface_stub = proptools.StringPtr(apiScope.kind.DefaultJavaLibraryName() + ".from-text") props.Full_api_surface_stub = proptools.StringPtr(apiScope.kind.DefaultJavaLibraryName())
if alternativeFullApiSurfaceStub != "" { if alternativeFullApiSurfaceStub != "" {
props.Full_api_surface_stub = proptools.StringPtr(alternativeFullApiSurfaceStub) props.Full_api_surface_stub = proptools.StringPtr(alternativeFullApiSurfaceStub)
} }

6
java/sdk_library_test.go
View File

@@ -1449,17 +1449,17 @@ func TestJavaSdkLibrary_ApiLibrary(t *testing.T) {
{ {
scope: apiScopePublic, scope: apiScopePublic,
apiContributions: []string{"foo.stubs.source.api.contribution"}, apiContributions: []string{"foo.stubs.source.api.contribution"},
fullApiSurfaceStub: "android_stubs_current.from-text", fullApiSurfaceStub: "android_stubs_current",
}, },
{ {
scope: apiScopeSystem, scope: apiScopeSystem,
apiContributions: []string{"foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, apiContributions: []string{"foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"},
fullApiSurfaceStub: "android_system_stubs_current.from-text", fullApiSurfaceStub: "android_system_stubs_current",
}, },
{ {
scope: apiScopeTest, scope: apiScopeTest,
apiContributions: []string{"foo.stubs.source.test.api.contribution", "foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"}, apiContributions: []string{"foo.stubs.source.test.api.contribution", "foo.stubs.source.system.api.contribution", "foo.stubs.source.api.contribution"},
fullApiSurfaceStub: "android_test_stubs_current.from-text", fullApiSurfaceStub: "android_test_stubs_current",
}, },
{ {
scope: apiScopeModuleLib, scope: apiScopeModuleLib,