Remove DirectlyInAnyApex (467b51d9) · Commits · e / os / android_build_soong

android/apex.go

+0 −50

Original line number	Diff line number	Diff line
		@@ -220,10 +220,6 @@ type ApexModule interface {
		// this after apex.apexMutator is run.
		InAnyApex() bool

		// Returns true if this module is directly in any APEX. Call this AFTER apex.apexMutator is
		// run.
		DirectlyInAnyApex() bool

		// NotInPlatform returns true if the module is not available to the platform due to
		// apex_available being set and not containing "//apex_available:platform".
		NotInPlatform() bool
		@@ -285,9 +281,6 @@ type ApexProperties struct {
		// See ApexModule.InAnyApex()
		InAnyApex bool `blueprint:"mutated"`

		// See ApexModule.DirectlyInAnyApex()
		DirectlyInAnyApex bool `blueprint:"mutated"`

		// See ApexModule.NotAvailableForPlatform()
		NotAvailableForPlatform bool `blueprint:"mutated"`

		@@ -324,16 +317,6 @@ type AlwaysRequireApexVariantTag interface {
		AlwaysRequireApexVariant() bool
		}

		// Marker interface that identifies dependencies that should inherit the DirectlyInAnyApex state
		// from the parent to the child. For example, stubs libraries are marked as DirectlyInAnyApex if
		// their implementation is in an apex.
		type CopyDirectlyInAnyApexTag interface {
		blueprint.DependencyTag

		// Method that differentiates this interface from others.
		CopyDirectlyInAnyApex()
		}

		// Interface that identifies dependencies to skip Apex dependency check
		type SkipApexAllowedDependenciesCheck interface {
		// Returns true to skip the Apex dependency check, which limits the allowed dependency in build.
		@@ -410,11 +393,6 @@ func (m *ApexModuleBase) InAnyApex() bool {
		return m.ApexProperties.InAnyApex
		}

		// Implements ApexModule
		func (m *ApexModuleBase) DirectlyInAnyApex() bool {
		return m.ApexProperties.DirectlyInAnyApex
		}

		// Implements ApexModule
		func (m *ApexModuleBase) NotInPlatform() bool {
		return !m.AvailableFor(AvailableToPlatform)
		@@ -674,14 +652,7 @@ func MutateApexTransition(ctx BaseModuleContext, variation string) {
		apexInfos, _ = mergeApexVariations(apexInfos)
		}

		var inApex ApexMembership
		for _, a := range apexInfos {
		for _, apexContents := range a.ApexContents {
		inApex = inApex.merge(apexContents.contents[ctx.ModuleName()])
		}
		}
		base.ApexProperties.InAnyApex = true
		base.ApexProperties.DirectlyInAnyApex = inApex == directlyInApex

		if platformVariation && !ctx.Host() && !module.AvailableFor(AvailableToPlatform) && module.NotAvailableForPlatform() {
		// Do not install the module for platform, but still allow it to output
		@@ -772,27 +743,6 @@ func UpdateUniqueApexVariationsForDeps(mctx BottomUpMutatorContext, am ApexModul
		})
		}

		// UpdateDirectlyInAnyApex uses the final module to store if any variant of this module is directly
		// in any APEX, and then copies the final value to all the modules. It also copies the
		// DirectlyInAnyApex value to any transitive dependencies with a CopyDirectlyInAnyApexTag
		// dependency tag.
		func UpdateDirectlyInAnyApex(mctx BottomUpMutatorContext, am ApexModule) {
		base := am.apexModuleBase()
		// Copy DirectlyInAnyApex and InAnyApex from any transitive dependencies with a
		// CopyDirectlyInAnyApexTag dependency tag.
		mctx.WalkDeps(func(child, parent Module) bool {
		if _, ok := mctx.OtherModuleDependencyTag(child).(CopyDirectlyInAnyApexTag); ok {
		depBase := child.(ApexModule).apexModuleBase()
		depBase.apexPropertiesLock.Lock()
		defer depBase.apexPropertiesLock.Unlock()
		depBase.ApexProperties.DirectlyInAnyApex = base.ApexProperties.DirectlyInAnyApex
		depBase.ApexProperties.InAnyApex = base.ApexProperties.InAnyApex
		return true
		}
		return false
		})
		}

		// ApexMembership tells how a module became part of an APEX.
		type ApexMembership int

apex/apex.go

+0 −11

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ func RegisterPostDepsMutators(ctx android.RegisterMutatorsContext) {
		// it should create a platform variant.
		ctx.BottomUp("mark_platform_availability", markPlatformAvailability)
		ctx.Transition("apex", &apexTransitionMutator{})
		ctx.BottomUp("apex_directly_in_any", apexDirectlyInAnyMutator).MutatesDependencies()
		}

		type apexBundleProperties struct {
		@@ -1242,14 +1241,6 @@ func apexModuleTypeRequiresVariant(module ApexInfoMutator) bool {
		return true
		}

		// See android.UpdateDirectlyInAnyApex
		// TODO(jiyong): move this to android/apex.go?
		func apexDirectlyInAnyMutator(mctx android.BottomUpMutatorContext) {
		if am, ok := mctx.Module().(android.ApexModule); ok {
		android.UpdateDirectlyInAnyApex(mctx, am)
		}
		}

		const (
		// File extensions of an APEX for different packaging methods
		imageApexSuffix = ".apex"
		@@ -2179,8 +2170,6 @@ func (a apexBundle) depVisitor(vctx visitorContext, ctx android.ModuleContext,
		ctx.PropertyErrorf("systemserverclasspath_fragments",
		"systemserverclasspath_fragment content %q of type %q is not supported", depName, ctx.OtherModuleType(child))
		}
		} else if _, ok := depTag.(android.CopyDirectlyInAnyApexTag); ok {
		// nothing
		} else if depTag == android.DarwinUniversalVariantTag {
		// nothing
		} else if depTag == android.RequiredDepTag {

java/bootclasspath_fragment.go

+0 −5

Original line number	Diff line number	Diff line
		@@ -83,10 +83,6 @@ func (b bootclasspathFragmentContentDependencyTag) ExportMember() bool {
		return true
		}

		// Contents of bootclasspath fragments in an apex are considered to be directly in the apex, as if
		// they were listed in java_libs.
		func (b bootclasspathFragmentContentDependencyTag) CopyDirectlyInAnyApex() {}

		// Contents of bootclasspath fragments require files from prebuilt apex files.
		func (b bootclasspathFragmentContentDependencyTag) RequiresFilesFromPrebuiltApex() {}

		@@ -96,7 +92,6 @@ var bootclasspathFragmentContentDepTag = bootclasspathFragmentContentDependencyT
		var _ android.ExcludeFromVisibilityEnforcementTag = bootclasspathFragmentContentDepTag
		var _ android.ReplaceSourceWithPrebuilt = bootclasspathFragmentContentDepTag
		var _ android.SdkMemberDependencyTag = bootclasspathFragmentContentDepTag
		var _ android.CopyDirectlyInAnyApexTag = bootclasspathFragmentContentDepTag
		var _ android.RequiresFilesFromPrebuiltApexTag = bootclasspathFragmentContentDepTag

		func IsBootclasspathFragmentContentDepTag(tag blueprint.DependencyTag) bool {

java/sdk_library.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -1314,12 +1314,6 @@ var implLibraryTag = sdkLibraryComponentTag{name: "impl-library"}

		var _ android.InstallNeededDependencyTag = sdkLibraryComponentTag{}

		// To satisfy the CopyDirectlyInAnyApexTag interface. Implementation library of the sdk library
		// in an apex is considered to be directly in the apex, as if it was listed in java_libs.
		func (t sdkLibraryComponentTag) CopyDirectlyInAnyApex() {}

		var _ android.CopyDirectlyInAnyApexTag = implLibraryTag

		func (t sdkLibraryComponentTag) InstallDepNeeded() bool {
		return t.name == "xml-permissions-file" \|\| t.name == "impl-library"
		}

java/systemserver_classpath_fragment.go

+0 −5

Original line number	Diff line number	Diff line
		@@ -218,16 +218,11 @@ func (b systemServerClasspathFragmentContentDependencyTag) ExportMember() bool {
		return true
		}

		// Contents of system server fragments in an apex are considered to be directly in the apex, as if
		// they were listed in java_libs.
		func (systemServerClasspathFragmentContentDependencyTag) CopyDirectlyInAnyApex() {}

		// Contents of system server fragments require files from prebuilt apex files.
		func (systemServerClasspathFragmentContentDependencyTag) RequiresFilesFromPrebuiltApex() {}

		var _ android.ReplaceSourceWithPrebuilt = systemServerClasspathFragmentContentDepTag
		var _ android.SdkMemberDependencyTag = systemServerClasspathFragmentContentDepTag
		var _ android.CopyDirectlyInAnyApexTag = systemServerClasspathFragmentContentDepTag
		var _ android.RequiresFilesFromPrebuiltApexTag = systemServerClasspathFragmentContentDepTag

		// The tag used for the dependency between the systemserverclasspath_fragment module and its contents.