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

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

Convert trivial TopDown mutators to BottomUp 

Many TopDown mutators can be easily converted to BottomUp mutators,
which are easier to handle for incremental and partial analysis.

Bug: 367784740
Test: all soong tests pass
Test: no change to build.ninja
Flag: EXEMPT refactor
Change-Id: I82955e844ed0eb6680854678c0744ac5398eb7ba
parent 16723003

android/defaults.go

+10 −6
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ type Defaultable interface { 


	// Apply defaults from the supplied Defaults to the property structures supplied to

	// setProperties(...).

	applyDefaults(TopDownMutatorContext, []Defaults)

	applyDefaults(BottomUpMutatorContext, []Defaults)



	// Set the hook to be called after any defaults have been applied.

	//
@@ -209,7 +209,7 @@ func InitDefaultsModule(module DefaultsModule) { 


var _ Defaults = (*DefaultsModuleBase)(nil)



func (defaultable *DefaultableModuleBase) applyDefaults(ctx TopDownMutatorContext,

func (defaultable *DefaultableModuleBase) applyDefaults(ctx BottomUpMutatorContext,

	defaultsList []Defaults) {



	for _, defaults := range defaultsList {
@@ -226,7 +226,7 @@ func (defaultable *DefaultableModuleBase) applyDefaults(ctx TopDownMutatorContex 
// Product variable properties need special handling, the type of the filtered product variable

// property struct may not be identical between the defaults module and the defaultable module.

// Use PrependMatchingProperties to apply whichever properties match.

func (defaultable *DefaultableModuleBase) applyDefaultVariableProperties(ctx TopDownMutatorContext,

func (defaultable *DefaultableModuleBase) applyDefaultVariableProperties(ctx BottomUpMutatorContext,

	defaults Defaults, defaultableProp interface{}) {

	if defaultableProp == nil {

		return
@@ -254,7 +254,7 @@ func (defaultable *DefaultableModuleBase) applyDefaultVariableProperties(ctx Top 
	}

}



func (defaultable *DefaultableModuleBase) applyDefaultProperties(ctx TopDownMutatorContext,

func (defaultable *DefaultableModuleBase) applyDefaultProperties(ctx BottomUpMutatorContext,

	defaults Defaults, defaultableProp interface{}) {



	for _, def := range defaults.properties() {
@@ -273,7 +273,7 @@ func (defaultable *DefaultableModuleBase) applyDefaultProperties(ctx TopDownMuta 


func RegisterDefaultsPreArchMutators(ctx RegisterMutatorsContext) {

	ctx.BottomUp("defaults_deps", defaultsDepsMutator).Parallel()

	ctx.TopDown("defaults", defaultsMutator).Parallel()

	ctx.BottomUp("defaults", defaultsMutator).Parallel()

}



func defaultsDepsMutator(ctx BottomUpMutatorContext) {
@@ -282,8 +282,12 @@ func defaultsDepsMutator(ctx BottomUpMutatorContext) { 
	}

}



func defaultsMutator(ctx TopDownMutatorContext) {

func defaultsMutator(ctx BottomUpMutatorContext) {

	if defaultable, ok := ctx.Module().(Defaultable); ok {

		if _, isDefaultsModule := ctx.Module().(Defaults); isDefaultsModule {

			// Don't squash transitive defaults into defaults modules

			return

		}

		defaults := defaultable.defaults().Defaults

		if len(defaults) > 0 {

			var defaultsList []Defaults

android/mutator.go

+12 −4
Original line number Diff line number Diff line
@@ -193,16 +193,16 @@ type BaseMutatorContext interface { 
	// Rename all variants of a module.  The new name is not visible to calls to ModuleName,

	// AddDependency or OtherModuleName until after this mutator pass is complete.

	Rename(name string)



	// CreateModule creates a new module by calling the factory method for the specified moduleType, and applies

	// the specified property structs to it as if the properties were set in a blueprint file.

	CreateModule(ModuleFactory, ...interface{}) Module

}



type TopDownMutator func(TopDownMutatorContext)



type TopDownMutatorContext interface {

	BaseMutatorContext



	// CreateModule creates a new module by calling the factory method for the specified moduleType, and applies

	// the specified property structs to it as if the properties were set in a blueprint file.

	CreateModule(ModuleFactory, ...interface{}) Module

}



type topDownMutatorContext struct {
@@ -739,6 +739,14 @@ func (b *bottomUpMutatorContext) Rename(name string) { 
	b.Module().base().commonProperties.DebugName = name

}



func (b *bottomUpMutatorContext) createModule(factory blueprint.ModuleFactory, name string, props ...interface{}) blueprint.Module {

	return b.bp.CreateModule(factory, name, props...)

}



func (b *bottomUpMutatorContext) CreateModule(factory ModuleFactory, props ...interface{}) Module {

	return createModule(b, factory, "_bottomUpMutatorModule", props...)

}



func (b *bottomUpMutatorContext) AddDependency(module blueprint.Module, tag blueprint.DependencyTag, name ...string) []blueprint.Module {

	if b.baseModuleContext.checkedMissingDeps() {

		panic("Adding deps not allowed after checking for missing deps")

android/visibility.go

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ func RegisterVisibilityRuleGatherer(ctx RegisterMutatorsContext) { 


// This must be registered after the deps have been resolved.

func RegisterVisibilityRuleEnforcer(ctx RegisterMutatorsContext) {

	ctx.TopDown("visibilityRuleEnforcer", visibilityRuleEnforcer).Parallel()

	ctx.BottomUp("visibilityRuleEnforcer", visibilityRuleEnforcer).Parallel()

}



// Checks the per-module visibility rule lists before defaults expansion.
@@ -507,7 +507,7 @@ func splitRule(ctx BaseModuleContext, ruleExpression string, currentPkg, propert 
	return true, pkg, name

}



func visibilityRuleEnforcer(ctx TopDownMutatorContext) {

func visibilityRuleEnforcer(ctx BottomUpMutatorContext) {

	qualified := createVisibilityModuleReference(ctx.ModuleName(), ctx.ModuleDir(), ctx.Module())



	// Visit all the dependencies making sure that this module has access to them all.

apex/apex.go

+1 −2
Original line number Diff line number Diff line
@@ -55,11 +55,10 @@ func registerApexBuildComponents(ctx android.RegistrationContext) { 
}



func registerPreArchMutators(ctx android.RegisterMutatorsContext) {

	ctx.TopDown("prebuilt_apex_module_creator", prebuiltApexModuleCreatorMutator).Parallel()

	ctx.BottomUp("prebuilt_apex_module_creator", prebuiltApexModuleCreatorMutator).Parallel()

}



func RegisterPreDepsMutators(ctx android.RegisterMutatorsContext) {

	ctx.TopDown("apex_vndk", apexVndkMutator).Parallel()

	ctx.BottomUp("apex_vndk_deps", apexVndkDepsMutator).Parallel()

}

apex/prebuilt.go

+7 −7
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries { 
// prebuiltApexModuleCreator defines the methods that need to be implemented by prebuilt_apex and

// apex_set in order to create the modules needed to provide access to the prebuilt .apex file.

type prebuiltApexModuleCreator interface {

	createPrebuiltApexModules(ctx android.TopDownMutatorContext)

	createPrebuiltApexModules(ctx android.BottomUpMutatorContext)

}



// prebuiltApexModuleCreatorMutator is the mutator responsible for invoking the
@@ -275,7 +275,7 @@ type prebuiltApexModuleCreator interface { 
// will need to access dependencies added by that (exported modules) but must run before the

// DepsMutator so that the deapexer module it creates can add dependencies onto itself from the

// exported modules.

func prebuiltApexModuleCreatorMutator(ctx android.TopDownMutatorContext) {

func prebuiltApexModuleCreatorMutator(ctx android.BottomUpMutatorContext) {

	module := ctx.Module()

	if creator, ok := module.(prebuiltApexModuleCreator); ok {

		creator.createPrebuiltApexModules(ctx)
@@ -543,7 +543,7 @@ func PrebuiltFactory() android.Module { 
	return module

}



func createApexSelectorModule(ctx android.TopDownMutatorContext, name string, apexFileProperties *ApexFileProperties) {

func createApexSelectorModule(ctx android.BottomUpMutatorContext, name string, apexFileProperties *ApexFileProperties) {

	props := struct {

		Name *string

	}{
@@ -561,7 +561,7 @@ func createApexSelectorModule(ctx android.TopDownMutatorContext, name string, ap 
// A deapexer module is only needed when the prebuilt apex specifies one or more modules in either

// the `exported_java_libs` or `exported_bootclasspath_fragments` properties as that indicates that

// the listed modules need access to files from within the prebuilt .apex file.

func (p *prebuiltCommon) createDeapexerModuleIfNeeded(ctx android.TopDownMutatorContext, deapexerName string, apexFileSource string) {

func (p *prebuiltCommon) createDeapexerModuleIfNeeded(ctx android.BottomUpMutatorContext, deapexerName string, apexFileSource string) {

	// Only create the deapexer module if it is needed.

	if !p.hasExportedDeps() {

		return
@@ -703,7 +703,7 @@ var _ prebuiltApexModuleCreator = (*Prebuilt)(nil) 
//     /         |         \

//     V            V            V

//     selector  <---  deapexer  <---  exported java lib

func (p *Prebuilt) createPrebuiltApexModules(ctx android.TopDownMutatorContext) {

func (p *Prebuilt) createPrebuiltApexModules(ctx android.BottomUpMutatorContext) {

	apexSelectorModuleName := apexSelectorModuleName(p.Name())

	createApexSelectorModule(ctx, apexSelectorModuleName, &p.properties.ApexFileProperties)
@@ -958,7 +958,7 @@ func apexSetFactory() android.Module { 
	return module

}



func createApexExtractorModule(ctx android.TopDownMutatorContext, name string, apexExtractorProperties *ApexExtractorProperties) {

func createApexExtractorModule(ctx android.BottomUpMutatorContext, name string, apexExtractorProperties *ApexExtractorProperties) {

	props := struct {

		Name *string

	}{
@@ -984,7 +984,7 @@ var _ prebuiltApexModuleCreator = (*ApexSet)(nil) 
// prebuilt_apex except that instead of creating a selector module which selects one .apex file

// from those provided this creates an extractor module which extracts the appropriate .apex file

// from the zip file containing them.

func (a *ApexSet) createPrebuiltApexModules(ctx android.TopDownMutatorContext) {

func (a *ApexSet) createPrebuiltApexModules(ctx android.BottomUpMutatorContext) {

	apexExtractorModuleName := apexExtractorModuleName(a.Name())

	createApexExtractorModule(ctx, apexExtractorModuleName, &a.properties.ApexExtractorProperties)