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

Merge "Remove OptionalImplicitSdkLibrary() function (it's not used anymore)."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2021-07-19 10:38:45 +00:00
committed by Gerrit Code Review
parent 52cc87959b 78645fbba1
commit c2427ea290
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/sdk_library.go
View File

@@ -980,14 +980,16 @@ func (e *EmbeddableSdkLibraryComponent) SdkLibraryName() *string {
return e.sdkLibraryComponentProperties.SdkLibraryName return e.sdkLibraryComponentProperties.SdkLibraryName
} }
// to satisfy SdkLibraryComponentDependency
func (e *EmbeddableSdkLibraryComponent) OptionalImplicitSdkLibrary() *string {
return e.sdkLibraryComponentProperties.SdkLibraryToImplicitlyTrack
}
// to satisfy SdkLibraryComponentDependency // to satisfy SdkLibraryComponentDependency
func (e *EmbeddableSdkLibraryComponent) OptionalSdkLibraryImplementation() *string { 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
// <uses-library> and should not be added to the manifest or to CLC.
return e.sdkLibraryComponentProperties.SdkLibraryToImplicitlyTrack return e.sdkLibraryComponentProperties.SdkLibraryToImplicitlyTrack
} }
@@ -999,12 +1001,6 @@ type SdkLibraryComponentDependency interface {
// SdkLibraryName returns the name of the java_sdk_library/_import module. // SdkLibraryName returns the name of the java_sdk_library/_import module.
SdkLibraryName() *string 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. // The name of the implementation library for the optional SDK library or nil, if there isn't one.
OptionalSdkLibraryImplementation() *string OptionalSdkLibraryImplementation() *string
} }