Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af47e248 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

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

Merge "Remove `OptionalImplicitSdkLibrary()` function (it's not used anymore)." am: c2427ea2 am: a9692035 am: aa201e2e

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769648

Change-Id: Icbe8844799cd915527878d0179116f602188e346
parents 62cad530 aa201e2e

java/sdk_library.go

+8 −12
Original line number Original line Diff line number Diff line
@@ -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

}

}