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

Follow input changes to proptools.CloneEmptyProperties

Browse Source 
Test: m checkbuild
Change-Id: I1fd53d03722d134009f7ed663f05bd6dc5980dd1
This commit is contained in:
Colin Cross
2020-01-28 09:46:50 -08:00
parent 5e0dbe4e3e
commit 43e789d667
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/hooks.go
View File

@@ -97,7 +97,7 @@ func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...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
// don't cause a "failed to find property to extend" error. // don't cause a "failed to find property to extend" error.
proptools.CloneEmptyProperties(reflect.ValueOf(src).Elem()).Interface(), proptools.CloneEmptyProperties(reflect.ValueOf(src)).Interface(),
} }
err := proptools.AppendMatchingProperties(dst, src, nil) err := proptools.AppendMatchingProperties(dst, src, nil)
if err != nil { if err != nil {

2
android/mutator.go
View File

@@ -270,7 +270,7 @@ func (t *topDownMutatorContext) CreateModule(factory ModuleFactory, props ...int
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
// don't cause a "failed to find property to extend" error. // don't cause a "failed to find property to extend" error.
proptools.CloneEmptyProperties(reflect.ValueOf(src).Elem()).Interface(), proptools.CloneEmptyProperties(reflect.ValueOf(src)).Interface(),
} }
err := proptools.AppendMatchingProperties(dst, src, nil) err := proptools.AppendMatchingProperties(dst, src, nil)
if err != nil { if err != nil {

2
android/soong_config_modules.go
View File

@@ -351,7 +351,7 @@ func soongConfigModuleFactory(factory blueprint.ModuleFactory,
return func() (blueprint.Module, []interface{}) { return func() (blueprint.Module, []interface{}) {
module, props := factory() module, props := factory()
conditionalProps := proptools.CloneEmptyProperties(conditionalFactoryProps.Elem()) conditionalProps := proptools.CloneEmptyProperties(conditionalFactoryProps)
props = append(props, conditionalProps.Interface()) props = append(props, conditionalProps.Interface())
AddLoadHook(module, func(ctx LoadHookContext) { AddLoadHook(module, func(ctx LoadHookContext) {

6
android/variable_test.go
View File

@@ -159,15 +159,15 @@ func testProductVariableModuleFactoryFactory(props interface{}) func() Module {
func TestProductVariables(t *testing.T) { func TestProductVariables(t *testing.T) {
ctx := NewTestContext() ctx := NewTestContext()
// A module type that has a srcs property but not a cflags property. // A module type that has a srcs property but not a cflags property.
ctx.RegisterModuleType("module1", testProductVariableModuleFactoryFactory(struct { ctx.RegisterModuleType("module1", testProductVariableModuleFactoryFactory(&struct {
Srcs []string Srcs []string
}{})) }{}))
// A module type that has a cflags property but not a srcs property. // A module type that has a cflags property but not a srcs property.
ctx.RegisterModuleType("module2", testProductVariableModuleFactoryFactory(struct { ctx.RegisterModuleType("module2", testProductVariableModuleFactoryFactory(&struct {
Cflags []string Cflags []string
}{})) }{}))
// A module type that does not have any properties that match product_variables. // A module type that does not have any properties that match product_variables.
ctx.RegisterModuleType("module3", testProductVariableModuleFactoryFactory(struct { ctx.RegisterModuleType("module3", testProductVariableModuleFactoryFactory(&struct {
Foo []string Foo []string
}{})) }{}))
ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) { ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) {