From 78645fbba10f390d9c814209985a038bf451bf2f Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Fri, 16 Jul 2021 15:29:25 +0100 Subject: [PATCH] Remove `OptionalImplicitSdkLibrary()` function (it's not used anymore). Slightly improve documentation for `OptionalSdkLibraryImplementation()`. Bug: 193425964 Test: m nothing Change-Id: I3c3f385cf948cdbec54b5a6fb33a4d24d4b54be3 --- java/sdk_library.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index 2b7185759..e5f84f722 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -980,14 +980,16 @@ func (e *EmbeddableSdkLibraryComponent) SdkLibraryName() *string { return e.sdkLibraryComponentProperties.SdkLibraryName } -// to satisfy SdkLibraryComponentDependency -func (e *EmbeddableSdkLibraryComponent) OptionalImplicitSdkLibrary() *string { - return e.sdkLibraryComponentProperties.SdkLibraryToImplicitlyTrack -} - // to satisfy SdkLibraryComponentDependency func (e *EmbeddableSdkLibraryComponent) OptionalSdkLibraryImplementation() *string { - // Currently implementation library name is the same as the SDK library name. + // For shared libraries, this is the same as the SDK library name. If a Java library or app + // depends on a component library (e.g. a stub library) it still needs to know the name of the + // run-time library and the corresponding module that provides the implementation. This name is + // passed to manifest_fixer (to be added to AndroidManifest.xml) and added to CLC (to be used + // in dexpreopt). + // + // For non-shared SDK (component or not) libraries this returns `nil`, as they are not + // and should not be added to the manifest or to CLC. return e.sdkLibraryComponentProperties.SdkLibraryToImplicitlyTrack } @@ -999,12 +1001,6 @@ type SdkLibraryComponentDependency interface { // SdkLibraryName returns the name of the java_sdk_library/_import module. SdkLibraryName() *string - // The optional name of the sdk library that should be implicitly added to the - // AndroidManifest of an app that contains code which references the sdk library. - // - // Returns the name of the optional implicit SDK library or nil, if there isn't one. - OptionalImplicitSdkLibrary() *string - // The name of the implementation library for the optional SDK library or nil, if there isn't one. OptionalSdkLibraryImplementation() *string }