From e7ee256746cce9fd3f54a5a6e306e390c007bce6 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Tue, 25 Jul 2023 05:51:46 +0000 Subject: [PATCH] Stop sdk_library generated api_library to depend on full surface api_library Since full_api_surface_libs extract class files instead of srcjar file, full_api_surface_stub can be replace with android_*_stubs_current, instead of the api_library android_*_stubs_current.from-text. Functionally, the class files of the two modules are identical (in from-text stub build), but depending on the from-text java_api_library leads to missing dependency errors in partial branches (especially ART branches). To resolve this problem, make sdk_library generated api_library depend on the missing dependency handled android_*_stubs_current. Since android_module_lib_stubs_current.from-text does not have its from-source equivalent, this can remain as dependency as the module is moved to build/soong in aosp/2674196 Test: m (default to from-text stub build) Bug: 274805756 Change-Id: Ic8bbd25252e5f9f1dc7c059ce6b00a951188985d --- java/sdk_library.go | 2 +- java/sdk_library_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index a38262b6c..b1ddde093 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -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) } diff --git a/java/sdk_library_test.go b/java/sdk_library_test.go index c22b9809b..118f8b68c 100644 --- a/java/sdk_library_test.go +++ b/java/sdk_library_test.go @@ -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,