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

Commit e1a85555 authored by Colin Cross's avatar Colin Cross
Browse files

Add IsAddingDependency to IncomingTransitionContext 

Add an IsAddingDependency method to IncomingTransitionContext that
returns true if IncomingTransition is called after the transition
has already won while adding a new dependency.  This will be used
as part of the transition mutators to support an apex use case where
incoming dependencies during the initial apex mutator need to be
rewritten onto the platform variant for modules that don't support
the apex, but a later call to OtherModuleDependencyVariantExists
must not rewrite the requested apex variation onto the platform
variant.

This should be used sparingly, all uses will have to be removed in
order to support creating variants on demand.

Bug: 319288033
Test: TestIsAddingDependency
Flag: EXEMPT refactor
Change-Id: Ib8e419d35ff8f7cbff9667c1cd40d05ccfacab8b
parent 694fced1

android/module.go

+5 −1
Original line number Diff line number Diff line
@@ -1746,7 +1746,11 @@ func (m *ModuleBase) baseModuleContextFactory(ctx blueprint.BaseModuleContext) b 
	}

}



func (m *ModuleBase) archModuleContextFactory(ctx blueprint.IncomingTransitionContext) archModuleContext {

type archModuleContextFactoryContext interface {

	Config() interface{}

}



func (m *ModuleBase) archModuleContextFactory(ctx archModuleContextFactoryContext) archModuleContext {

	config := ctx.Config().(Config)

	target := m.Target()

	primaryArch := false

android/mutator.go

+10 −0
Original line number Diff line number Diff line
@@ -400,6 +400,12 @@ type IncomingTransitionContext interface { 
	Config() Config



	DeviceConfig() DeviceConfig



	// IsAddingDependency returns true if the transition is being called while adding a dependency

	// after the transition mutator has already run, or false if it is being called when the transition

	// mutator is running.  This should be used sparingly, all uses will have to be removed in order

	// to support creating variants on demand.

	IsAddingDependency() bool

}



type OutgoingTransitionContext interface {
@@ -574,6 +580,10 @@ func (c *incomingTransitionContextImpl) DeviceConfig() DeviceConfig { 
	return DeviceConfig{c.bp.Config().(Config).deviceConfig}

}



func (c *incomingTransitionContextImpl) IsAddingDependency() bool {

	return c.bp.IsAddingDependency()

}



func (c *incomingTransitionContextImpl) provider(provider blueprint.AnyProviderKey) (any, bool) {

	return c.bp.Provider(provider)

}

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ func (a *apexBundle) TaggedOutputs() map[string]android.Paths { 
var _ cc.Coverage = (*apexBundle)(nil)



// Implements cc.Coverage

func (a *apexBundle) IsNativeCoverageNeeded(ctx android.IncomingTransitionContext) bool {

func (a *apexBundle) IsNativeCoverageNeeded(ctx cc.IsNativeCoverageNeededContext) bool {

	return ctx.DeviceConfig().NativeCoverageEnabled()

}

cc/coverage.go

+31 −21
Original line number Diff line number Diff line
@@ -247,9 +247,19 @@ func SetCoverageProperties(ctx android.BaseModuleContext, properties CoveragePro 
	return properties

}



type IsNativeCoverageNeededContext interface {

	Config() android.Config

	DeviceConfig() android.DeviceConfig

	Device() bool

}



var _ IsNativeCoverageNeededContext = android.IncomingTransitionContext(nil)

var _ IsNativeCoverageNeededContext = android.BaseModuleContext(nil)

var _ IsNativeCoverageNeededContext = android.BottomUpMutatorContext(nil)



type UseCoverage interface {

	android.Module

	IsNativeCoverageNeeded(ctx android.IncomingTransitionContext) bool

	IsNativeCoverageNeeded(ctx IsNativeCoverageNeededContext) bool

}



// Coverage is an interface for non-CC modules to implement to be mutated for coverage

filesystem/filesystem.go

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ func sha1sum(values []string) string { 


var _ cc.UseCoverage = (*filesystem)(nil)



func (*filesystem) IsNativeCoverageNeeded(ctx android.IncomingTransitionContext) bool {

func (*filesystem) IsNativeCoverageNeeded(ctx cc.IsNativeCoverageNeededContext) bool {

	return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled()

}