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

Commit 6a77e77c authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Pass module to SdkMemberTypeDependencyTag.SdkMemberType"

parents 70018481 eee466e4

android/sdk.go

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ type SdkMemberTypeDependencyTag interface { 


	// SdkMemberType returns the SdkMemberType that will be used to automatically add the child module

	// to the sdk.

	SdkMemberType() SdkMemberType

	SdkMemberType(child Module) SdkMemberType



	// ExportMember determines whether a module added to the sdk through this tag will be exported

	// from the sdk or not.
@@ -317,7 +317,7 @@ type sdkMemberDependencyTag struct { 
	export     bool

}



func (t *sdkMemberDependencyTag) SdkMemberType() SdkMemberType {

func (t *sdkMemberDependencyTag) SdkMemberType(_ Module) SdkMemberType {

	return t.memberType

}

java/bootclasspath_fragment.go

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ func (b bootclasspathFragmentContentDependencyTag) ReplaceSourceWithPrebuilt() b 


// SdkMemberType causes dependencies added with this tag to be automatically added to the sdk as if

// they were specified using java_boot_libs.

func (b bootclasspathFragmentContentDependencyTag) SdkMemberType() android.SdkMemberType {

func (b bootclasspathFragmentContentDependencyTag) SdkMemberType(_ android.Module) android.SdkMemberType {

	return javaBootLibsSdkMemberType

}

sdk/update.go

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ func (s *sdk) collectMembers(ctx android.ModuleContext) { 
	ctx.WalkDeps(func(child android.Module, parent android.Module) bool {

		tag := ctx.OtherModuleDependencyTag(child)

		if memberTag, ok := tag.(android.SdkMemberTypeDependencyTag); ok {

			memberType := memberTag.SdkMemberType()

			memberType := memberTag.SdkMemberType(child)



			// Make sure that the resolved module is allowed in the member list property.

			if !memberType.IsInstance(child) {