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

Share CreateModule between hooks & mutators

Browse Source 
These contained duplicate code, but evolved separately in the effort to
identify module type of those created with CreateModule. This refactors
to share a common implementation between the two.

Test: m json-module-graph and verify Type fields
Test: CI
Change-Id: Ifdb9a006d9b1bef7411f9ce3a4384797693b4bfc
This commit is contained in:
Liz Kammer
2022-04-26 09:08:55 -04:00
parent e31a071389
commit f31c90050c
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
android/hooks.go
View File

@@ -89,8 +89,17 @@ func (l *loadHookContext) PrependProperties(props ...interface{}) {
l.appendPrependHelper(props, proptools.PrependMatchingProperties) l.appendPrependHelper(props, proptools.PrependMatchingProperties)
} }
func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface{}) Module { func (l *loadHookContext) createModule(factory blueprint.ModuleFactory, name string, props ...interface{}) blueprint.Module {
inherited := []interface{}{&l.Module().base().commonProperties} return l.bp.CreateModule(factory, name, props...)
}
type createModuleContext interface {
Module() Module
createModule(blueprint.ModuleFactory, string, ...interface{}) blueprint.Module
}
func createModule(ctx createModuleContext, factory ModuleFactory, ext string, props ...interface{}) Module {
inherited := []interface{}{&ctx.Module().base().commonProperties}
var typeName string var typeName string
if typeNameLookup, ok := ModuleTypeByFactory()[reflect.ValueOf(factory)]; ok { if typeNameLookup, ok := ModuleTypeByFactory()[reflect.ValueOf(factory)]; ok {
@@ -101,12 +110,12 @@ func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface
filePath, _ := factoryFunc.FileLine(factoryPtr) filePath, _ := factoryFunc.FileLine(factoryPtr)
typeName = fmt.Sprintf("%s_%s", path.Base(filePath), factoryFunc.Name()) typeName = fmt.Sprintf("%s_%s", path.Base(filePath), factoryFunc.Name())
} }
typeName = typeName + "_loadHookModule" typeName = typeName + "_" + ext
module := l.bp.CreateModule(ModuleFactoryAdaptor(factory), typeName, append(inherited, props...)...).(Module) module := ctx.createModule(ModuleFactoryAdaptor(factory), typeName, append(inherited, props...)...).(Module)
if l.Module().base().variableProperties != nil && module.base().variableProperties != nil { if ctx.Module().base().variableProperties != nil && module.base().variableProperties != nil {
src := l.Module().base().variableProperties src := ctx.Module().base().variableProperties
dst := []interface{}{ dst := []interface{}{
module.base().variableProperties, module.base().variableProperties,
// Put an empty copy of the src properties into dst so that properties in src that are not in dst // Put an empty copy of the src properties into dst so that properties in src that are not in dst
@@ -122,6 +131,10 @@ func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface
return module return module
} }
func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface{}) Module {
return createModule(l, factory, "_loadHookModule", props...)
}
func (l *loadHookContext) registerScopedModuleType(name string, factory blueprint.ModuleFactory) { func (l *loadHookContext) registerScopedModuleType(name string, factory blueprint.ModuleFactory) {
l.bp.RegisterScopedModuleType(name, factory) l.bp.RegisterScopedModuleType(name, factory)
} }

28
android/mutator.go
View File

@@ -15,12 +15,9 @@
package android package android
import ( import (
"reflect"
"android/soong/bazel" "android/soong/bazel"
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/proptools"
) )
// Phases: // Phases:
@@ -553,29 +550,16 @@ func (t *topDownMutatorContext) Rename(name string) {
t.Module().base().commonProperties.DebugName = name t.Module().base().commonProperties.DebugName = name
} }
func (t *topDownMutatorContext) createModule(factory blueprint.ModuleFactory, name string, props ...interface{}) blueprint.Module {
return t.bp.CreateModule(factory, name, props...)
}
func (t *topDownMutatorContext) CreateModule(factory ModuleFactory, props ...interface{}) Module { func (t *topDownMutatorContext) CreateModule(factory ModuleFactory, props ...interface{}) Module {
inherited := []interface{}{&t.Module().base().commonProperties} return createModule(t, factory, "_topDownMutatorModule", props...)
module := t.bp.CreateModule(ModuleFactoryAdaptor(factory), append(inherited, props...)...).(Module)
if t.Module().base().variableProperties != nil && module.base().variableProperties != nil {
src := t.Module().base().variableProperties
dst := []interface{}{
module.base().variableProperties,
// Put an empty copy of the src properties into dst so that properties in src that are not in dst
// don't cause a "failed to find property to extend" error.
proptools.CloneEmptyProperties(reflect.ValueOf(src)).Interface(),
}
err := proptools.AppendMatchingProperties(dst, src, nil)
if err != nil {
panic(err)
}
}
return module
} }
func (t *topDownMutatorContext) createModuleWithoutInheritance(factory ModuleFactory, props ...interface{}) Module { func (t *topDownMutatorContext) createModuleWithoutInheritance(factory ModuleFactory, props ...interface{}) Module {
module := t.bp.CreateModule(ModuleFactoryAdaptor(factory), props...).(Module) module := t.bp.CreateModule(ModuleFactoryAdaptor(factory), "", props...).(Module)
return module return module
} }