Follow input changes to proptools.CloneEmptyProperties

Test: m checkbuild
Change-Id: I1fd53d03722d134009f7ed663f05bd6dc5980dd1

4 files changed, 6 insertions, 6 deletions

diff --git a/android/hooks.go b/android/hooks.go
index e8cd81b60..47f69d1e8 100644
--- a/android/hooks.go
+++ b/android/hooks.go
@@ -97,7 +97,7 @@ func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...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).Elem()).Interface(),
+			proptools.CloneEmptyProperties(reflect.ValueOf(src)).Interface(),
 		}
 		err := proptools.AppendMatchingProperties(dst, src, nil)
 		if err != nil {
diff --git a/android/mutator.go b/android/mutator.go
index 3d1bb4f7d..a46d4beb1 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -270,7 +270,7 @@ func (t *topDownMutatorContext) CreateModule(factory ModuleFactory, props ...int
 			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).Elem()).Interface(),
+			proptools.CloneEmptyProperties(reflect.ValueOf(src)).Interface(),
 		}
 		err := proptools.AppendMatchingProperties(dst, src, nil)
 		if err != nil {
diff --git a/android/soong_config_modules.go b/android/soong_config_modules.go
index bdec64b8c..3e5595849 100644
--- a/android/soong_config_modules.go
+++ b/android/soong_config_modules.go
@@ -351,7 +351,7 @@ func soongConfigModuleFactory(factory blueprint.ModuleFactory,
 		return func() (blueprint.Module, []interface{}) {
 			module, props := factory()
 
-			conditionalProps := proptools.CloneEmptyProperties(conditionalFactoryProps.Elem())
+			conditionalProps := proptools.CloneEmptyProperties(conditionalFactoryProps)
 			props = append(props, conditionalProps.Interface())
 
 			AddLoadHook(module, func(ctx LoadHookContext) {
diff --git a/android/variable_test.go b/android/variable_test.go
index 751677fb0..cde2b1ac9 100644
--- a/android/variable_test.go
+++ b/android/variable_test.go
@@ -159,15 +159,15 @@ func testProductVariableModuleFactoryFactory(props interface{}) func() Module {
 func TestProductVariables(t *testing.T) {
 	ctx := NewTestContext()
 	// 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
 	}{}))
 	// 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
 	}{}))
 	// 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
 	}{}))
 	ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) {