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

Merge "Minor refactoring of Append/PrependProperties() methods Test: m nothing and compare ninja file Bug: n/a"

Browse Source
This commit is contained in:
Usta Shrestha
2021-11-24 15:18:37 +00:00
committed by Gerrit Code Review
parent 4ad40d99b0 ef3676c94b
commit 8c64fa9a8e
3 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
android/hooks.go
View File

@@ -65,10 +65,10 @@ func (l *loadHookContext) moduleFactories() map[string]blueprint.ModuleFactory {
return l.bp.ModuleFactories() return l.bp.ModuleFactories()
} }
func (l *loadHookContext) AppendProperties(props ...interface{}) { func (l *loadHookContext) appendPrependHelper(props []interface{},
extendFn func([]interface{}, interface{}, proptools.ExtendPropertyFilterFunc) error) {
for _, p := range props { for _, p := range props {
err := proptools.AppendMatchingProperties(l.Module().base().customizableProperties, err := extendFn(l.Module().base().customizableProperties, p, nil)
p, nil)
if err != nil { if err != nil {
if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok { if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
l.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error()) l.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
@@ -78,19 +78,12 @@ func (l *loadHookContext) AppendProperties(props ...interface{}) {
} }
} }
} }
func (l *loadHookContext) AppendProperties(props ...interface{}) {
l.appendPrependHelper(props, proptools.AppendMatchingProperties)
}
func (l *loadHookContext) PrependProperties(props ...interface{}) { func (l *loadHookContext) PrependProperties(props ...interface{}) {
for _, p := range props { l.appendPrependHelper(props, proptools.PrependMatchingProperties)
err := proptools.PrependMatchingProperties(l.Module().base().customizableProperties,
p, nil)
if err != nil {
if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
l.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
} else {
panic(err)
}
}
}
} }
func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface{}) Module { func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface{}) Module {

2
android/module.go
View File

@@ -1148,7 +1148,7 @@ func (attrs *CommonAttributes) fillCommonBp2BuildModuleAttrs(ctx *topDownMutator
// } // }
// } // }
// //
// func NewMyModule() android.Module) { // func NewMyModule() android.Module {
// m := &myModule{} // m := &myModule{}
// m.AddProperties(&m.properties) // m.AddProperties(&m.properties)
// android.InitAndroidModule(m) // android.InitAndroidModule(m)

22
android/mutator.go
View File

@@ -529,10 +529,10 @@ func (t *topDownMutatorContext) CreateBazelTargetModule(
mod.base().addBp2buildInfo(info) mod.base().addBp2buildInfo(info)
} }
func (t *topDownMutatorContext) AppendProperties(props ...interface{}) { func (t *topDownMutatorContext) appendPrependHelper(props []interface{},
extendFn func([]interface{}, interface{}, proptools.ExtendPropertyFilterFunc) error) {
for _, p := range props { for _, p := range props {
err := proptools.AppendMatchingProperties(t.Module().base().customizableProperties, err := extendFn(t.Module().base().customizableProperties, p, nil)
p, nil)
if err != nil { if err != nil {
if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok { if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
t.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error()) t.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
@@ -543,18 +543,12 @@ func (t *topDownMutatorContext) AppendProperties(props ...interface{}) {
} }
} }
func (t *topDownMutatorContext) AppendProperties(props ...interface{}) {
t.appendPrependHelper(props, proptools.AppendMatchingProperties)
}
func (t *topDownMutatorContext) PrependProperties(props ...interface{}) { func (t *topDownMutatorContext) PrependProperties(props ...interface{}) {
for _, p := range props { t.appendPrependHelper(props, proptools.PrependMatchingProperties)
err := proptools.PrependMatchingProperties(t.Module().base().customizableProperties,
p, nil)
if err != nil {
if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
t.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
} else {
panic(err)
}
}
}
} }
// android.topDownMutatorContext either has to embed blueprint.TopDownMutatorContext, in which case every method that // android.topDownMutatorContext either has to embed blueprint.TopDownMutatorContext, in which case every method that