Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" (c2c7f3e4) · Commits · e / os / android_build_soong

android/licenses.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ var (

		// License modules, i.e. modules depended upon via a licensesTag, must be automatically added to
		// any sdk/module_exports to which their referencing module is a member.
		_ SdkMemberTypeDependencyTag = licensesTag
		_ SdkMemberDependencyTag = licensesTag
		)

		// Describes the property provided by a module to reference applicable licenses.

android/sdk.go

+11 −11

Original line number	Diff line number	Diff line
		@@ -374,9 +374,9 @@ type SdkMember interface {
		Variants() []SdkAware
		}

		// SdkMemberTypeDependencyTag is the interface that a tag must implement in order to allow the
		// SdkMemberDependencyTag is the interface that a tag must implement in order to allow the
		// dependent module to be automatically added to the sdk.
		type SdkMemberTypeDependencyTag interface {
		type SdkMemberDependencyTag interface {
		blueprint.DependencyTag

		// SdkMemberType returns the SdkMemberType that will be used to automatically add the child module
		@@ -401,34 +401,34 @@ type SdkMemberTypeDependencyTag interface {
		ExportMember() bool
		}

		var _ SdkMemberTypeDependencyTag = (*sdkMemberTypeDependencyTag)(nil)
		var _ ReplaceSourceWithPrebuilt = (*sdkMemberTypeDependencyTag)(nil)
		var _ SdkMemberDependencyTag = (*sdkMemberDependencyTag)(nil)
		var _ ReplaceSourceWithPrebuilt = (*sdkMemberDependencyTag)(nil)

		type sdkMemberTypeDependencyTag struct {
		type sdkMemberDependencyTag struct {
		blueprint.BaseDependencyTag
		memberType SdkMemberType
		export bool
		}

		func (t *sdkMemberTypeDependencyTag) SdkMemberType(_ Module) SdkMemberType {
		func (t *sdkMemberDependencyTag) SdkMemberType(_ Module) SdkMemberType {
		return t.memberType
		}

		func (t *sdkMemberTypeDependencyTag) ExportMember() bool {
		func (t *sdkMemberDependencyTag) ExportMember() bool {
		return t.export
		}

		// Prevent dependencies from the sdk/module_exports onto their members from being
		// replaced with a preferred prebuilt.
		func (t *sdkMemberTypeDependencyTag) ReplaceSourceWithPrebuilt() bool {
		func (t *sdkMemberDependencyTag) ReplaceSourceWithPrebuilt() bool {
		return false
		}

		// DependencyTagForSdkMemberType creates an SdkMemberTypeDependencyTag that will cause any
		// DependencyTagForSdkMemberType creates an SdkMemberDependencyTag that will cause any
		// dependencies added by the tag to be added to the sdk as the specified SdkMemberType and exported
		// (or not) as specified by the export parameter.
		func DependencyTagForSdkMemberType(memberType SdkMemberType, export bool) SdkMemberTypeDependencyTag {
		return &sdkMemberTypeDependencyTag{memberType: memberType, export: export}
		func DependencyTagForSdkMemberType(memberType SdkMemberType, export bool) SdkMemberDependencyTag {
		return &sdkMemberDependencyTag{memberType: memberType, export: export}
		}

		// Interface that must be implemented for every type that can be a member of an

java/bootclasspath_fragment.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ var bootclasspathFragmentContentDepTag = bootclasspathFragmentContentDependencyT

		var _ android.ExcludeFromVisibilityEnforcementTag = bootclasspathFragmentContentDepTag
		var _ android.ReplaceSourceWithPrebuilt = bootclasspathFragmentContentDepTag
		var _ android.SdkMemberTypeDependencyTag = bootclasspathFragmentContentDepTag
		var _ android.SdkMemberDependencyTag = bootclasspathFragmentContentDepTag
		var _ android.CopyDirectlyInAnyApexTag = bootclasspathFragmentContentDepTag
		var _ android.RequiresFilesFromPrebuiltApexTag = bootclasspathFragmentContentDepTag

java/hiddenapi_modular.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ func (b hiddenAPIStubsDependencyTag) ExcludeFromVisibilityEnforcement() {
		var _ android.ExcludeFromVisibilityEnforcementTag = hiddenAPIStubsDependencyTag{}
		var _ android.ReplaceSourceWithPrebuilt = hiddenAPIStubsDependencyTag{}
		var _ android.ExcludeFromApexContentsTag = hiddenAPIStubsDependencyTag{}
		var _ android.SdkMemberTypeDependencyTag = hiddenAPIStubsDependencyTag{}
		var _ android.SdkMemberDependencyTag = hiddenAPIStubsDependencyTag{}

		// hiddenAPIComputeMonolithicStubLibModules computes the set of module names that provide stubs
		// needed to produce the hidden API monolithic stub flags file.

sdk/member_type.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ type sdkMemberTypeListProperty struct {

		// the dependency tag used for items in this list that can be used to determine the memberType
		// for a resolved dependency.
		dependencyTag android.SdkMemberTypeDependencyTag
		dependencyTag android.SdkMemberDependencyTag
		}

		func (p *sdkMemberTypeListProperty) propertyName() string {