StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove registerOverrideMutator" am: 37b3626f2c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1698867

Change-Id: Ibd2e4bf297a6c898d24e3775e45a16802079af0f
This commit is contained in:
Colin Cross
2021-06-03 17:42:41 +00:00
committed by Automerger Merge Worker
parent acbf71ae2b 37b3626f2c
commit d1f1e590e6
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/override_module.go
View File

@@ -213,7 +213,6 @@ func (b *OverridableModuleBase) OverridablePropertiesDepsMutator(ctx BottomUpMut
// to keep them in this order and not put any order mutators between them. // to keep them in this order and not put any order mutators between them.
func RegisterOverridePostDepsMutators(ctx RegisterMutatorsContext) { func RegisterOverridePostDepsMutators(ctx RegisterMutatorsContext) {
ctx.BottomUp("override_deps", overrideModuleDepsMutator).Parallel() ctx.BottomUp("override_deps", overrideModuleDepsMutator).Parallel()
ctx.TopDown("register_override", registerOverrideMutator).Parallel()
ctx.BottomUp("perform_override", performOverrideMutator).Parallel() ctx.BottomUp("perform_override", performOverrideMutator).Parallel()
// overridableModuleDepsMutator calls OverridablePropertiesDepsMutator so that overridable modules can // overridableModuleDepsMutator calls OverridablePropertiesDepsMutator so that overridable modules can
// add deps from overridable properties. // add deps from overridable properties.
@@ -253,20 +252,11 @@ func overrideModuleDepsMutator(ctx BottomUpMutatorContext) {
return return
} }
}) })
ctx.AddDependency(ctx.Module(), overrideBaseDepTag, *module.getOverrideModuleProperties().Base) baseModule := ctx.AddDependency(ctx.Module(), overrideBaseDepTag, *module.getOverrideModuleProperties().Base)[0]
} if o, ok := baseModule.(OverridableModule); ok {
}
// Visits the base module added as a dependency above, checks the module type, and registers the
// overriding module.
func registerOverrideMutator(ctx TopDownMutatorContext) {
ctx.VisitDirectDepsWithTag(overrideBaseDepTag, func(base Module) {
if o, ok := base.(OverridableModule); ok {
o.addOverride(ctx.Module().(OverrideModule)) o.addOverride(ctx.Module().(OverrideModule))
} else {
ctx.PropertyErrorf("base", "unsupported base module type")
} }
}) }
} }
// Now, goes through all overridable modules, finds all modules overriding them, creates a local // Now, goes through all overridable modules, finds all modules overriding them, creates a local