diff --git a/android/sdk.go b/android/sdk.go index b4ef8aa74..5521f4a31 100644 --- a/android/sdk.go +++ b/android/sdk.go @@ -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 } diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 2e33c06c3..ef2cdae27 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -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 } diff --git a/sdk/update.go b/sdk/update.go index 3668b461f..72b02e831 100644 --- a/sdk/update.go +++ b/sdk/update.go @@ -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) {