Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main (f5ee8e3f) · Commits · e / os / android_build_soong

java/sdk_library.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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, "stub-annotations")
		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 != "" {
		props.Full_api_surface_stub = proptools.StringPtr(alternativeFullApiSurfaceStub)
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -1449,17 +1449,17 @@ func TestJavaSdkLibrary_ApiLibrary(t *testing.T) {
		{
		scope: apiScopePublic,
		apiContributions: []string{"foo.stubs.source.api.contribution"},
		fullApiSurfaceStub: "android_stubs_current.from-text",
		fullApiSurfaceStub: "android_stubs_current",
		},
		{
		scope: apiScopeSystem,
		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,
		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,