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

Convert defaults to a top down mutator

Browse Source 
am: 1317701114

Change-Id: I3736f583432d56a7dd1889ba948b9253158c9543
This commit is contained in:
Colin Cross
2016-08-09 23:23:01 +00:00
committed by android-build-merger
parent 476861290e 1317701114
commit adbf48c3df
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/arch.go
View File

@@ -26,7 +26,7 @@ import (
func init() { func init() {
RegisterBottomUpMutator("defaults_deps", defaultsDepsMutator) RegisterBottomUpMutator("defaults_deps", defaultsDepsMutator)
RegisterBottomUpMutator("defaults", defaultsMutator) RegisterTopDownMutator("defaults", defaultsMutator)
RegisterBottomUpMutator("arch", ArchMutator) RegisterBottomUpMutator("arch", ArchMutator)
} }

28
android/defaults.go
View File

@@ -45,7 +45,7 @@ func (d *DefaultableModule) setProperties(props []interface{}) {
type Defaultable interface { type Defaultable interface {
defaults() *defaultsProperties defaults() *defaultsProperties
setProperties([]interface{}) setProperties([]interface{})
applyDefaults(BottomUpMutatorContext, Defaults) applyDefaults(TopDownMutatorContext, []Defaults)
} }
var _ Defaultable = (*DefaultableModule)(nil) var _ Defaultable = (*DefaultableModule)(nil)
@@ -85,9 +85,10 @@ func InitDefaultsModule(module Module, d Defaults, props ...interface{}) (bluepr
var _ Defaults = (*DefaultsModule)(nil) var _ Defaults = (*DefaultsModule)(nil)
func (defaultable *DefaultableModule) applyDefaults(ctx BottomUpMutatorContext, func (defaultable *DefaultableModule) applyDefaults(ctx TopDownMutatorContext,
defaults Defaults) { defaultsList []Defaults) {
for _, defaults := range defaultsList {
for _, prop := range defaultable.defaultableProperties { for _, prop := range defaultable.defaultableProperties {
for _, def := range defaults.properties() { for _, def := range defaults.properties() {
if proptools.TypeEqual(prop, def) { if proptools.TypeEqual(prop, def) {
@@ -102,6 +103,7 @@ func (defaultable *DefaultableModule) applyDefaults(ctx BottomUpMutatorContext,
} }
} }
} }
}
} }
func defaultsDepsMutator(ctx BottomUpMutatorContext) { func defaultsDepsMutator(ctx BottomUpMutatorContext) {
@@ -110,19 +112,21 @@ func defaultsDepsMutator(ctx BottomUpMutatorContext) {
} }
} }
func defaultsMutator(ctx BottomUpMutatorContext) { func defaultsMutator(ctx TopDownMutatorContext) {
if defaultable, ok := ctx.Module().(Defaultable); ok { if defaultable, ok := ctx.Module().(Defaultable); ok && len(defaultable.defaults().Defaults) > 0 {
for _, defaultsDep := range defaultable.defaults().Defaults { var defaultsList []Defaults
ctx.VisitDirectDeps(func(m blueprint.Module) { ctx.WalkDeps(func(module, parent blueprint.Module) bool {
if ctx.OtherModuleName(m) == defaultsDep { if ctx.OtherModuleDependencyTag(module) == DefaultsDepTag {
if defaultsModule, ok := m.(Defaults); ok { if defaults, ok := module.(Defaults); ok {
defaultable.applyDefaults(ctx, defaultsModule) defaultsList = append(defaultsList, defaults)
return len(defaults.defaults().Defaults) > 0
} else { } else {
ctx.PropertyErrorf("defaults", "module %s is not an defaults module", ctx.PropertyErrorf("defaults", "module %s is not an defaults module",
ctx.OtherModuleName(m)) ctx.OtherModuleName(module))
} }
} }
return false
}) })
} defaultable.applyDefaults(ctx, defaultsList)
} }
} }