tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow defaults modules to have defaults"

Browse source
This commit is contained in:
Colin Cross 2016-07-27 23:20:05 +00:00 committed by Gerrit Code Review
commit 2846cc448b
2 changed files with 8 additions and 13 deletions
Show stats 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() {
RegisterBottomUpMutator("defaults_deps", defaultsDepsMutator)
RegisterTopDownMutator("defaults", defaultsMutator)
RegisterBottomUpMutator("defaults", defaultsMutator)
RegisterBottomUpMutator("arch", ArchMutator)
}

19
android/defaults.go
View file

@ -45,7 +45,7 @@ func (d *DefaultableModule) setProperties(props []interface{}) {
type Defaultable interface {
defaults() *defaultsProperties
setProperties([]interface{})
applyDefaults(TopDownMutatorContext, Defaults)
applyDefaults(BottomUpMutatorContext, Defaults)
}
var _ Defaultable = (*DefaultableModule)(nil)
@ -61,12 +61,13 @@ func InitDefaultableModule(module Module, d Defaultable,
}
type DefaultsModule struct {
DefaultableModule
defaultProperties []interface{}
}
type Defaults interface {
Defaultable
isDefaults() bool
setProperties([]interface{})
properties() []interface{}
}
@ -75,22 +76,16 @@ func (d *DefaultsModule) isDefaults() bool {
}
func (d *DefaultsModule) properties() []interface{} {
return d.defaultProperties
}
func (d *DefaultsModule) setProperties(props []interface{}) {
d.defaultProperties = props
return d.defaultableProperties
}
func InitDefaultsModule(module Module, d Defaults, props ...interface{}) (blueprint.Module, []interface{}) {
d.setProperties(props)
return module, props
return InitDefaultableModule(module, d, props...)
}
var _ Defaults = (*DefaultsModule)(nil)
func (defaultable *DefaultableModule) applyDefaults(ctx TopDownMutatorContext,
func (defaultable *DefaultableModule) applyDefaults(ctx BottomUpMutatorContext,
defaults Defaults) {
for _, prop := range defaultable.defaultableProperties {
@ -115,7 +110,7 @@ func defaultsDepsMutator(ctx BottomUpMutatorContext) {
}
}
func defaultsMutator(ctx TopDownMutatorContext) {
func defaultsMutator(ctx BottomUpMutatorContext) {
if defaultable, ok := ctx.Module().(Defaultable); ok {
for _, defaultsDep := range defaultable.defaults().Defaults {
ctx.VisitDirectDeps(func(m blueprint.Module) {