diff options
| author | 2019-06-10 16:38:11 +0000 | |
|---|---|---|
| committer | 2019-06-10 16:38:11 +0000 | |
| commit | a6bf56d4bede80f1942d775a22f15bdc0d33e37a (patch) | |
| tree | 0c61bc58e74650c98924ab38a1e52944f02d35a2 /android/variable.go | |
| parent | 50e91c1a7a93077989cc590ea3878c46b3df4ba8 (diff) | |
| parent | 7e0a2cb590f2f2d117571327f40fa8557363658c (diff) | |
Merge changes I9f8df94f,I2d7f5c56,I0ebb7381,Ieefcfc1a
* changes:
Consolidate *MutatorContext and ModuleContext into BaseModuleContext
Consolidate baseContext, BaseContext, and BaseModuleContext
Rename ModuleBase receivers
Remove repetition in android package names
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go index d039a1659..b4f31c619 100644 --- a/android/variable.go +++ b/android/variable.go @@ -402,12 +402,12 @@ func variableMutator(mctx BottomUpMutatorContext) { } } -func (a *ModuleBase) setVariableProperties(ctx BottomUpMutatorContext, +func (m *ModuleBase) setVariableProperties(ctx BottomUpMutatorContext, prefix string, productVariablePropertyValue reflect.Value, variableValue interface{}) { printfIntoProperties(ctx, prefix, productVariablePropertyValue, variableValue) - err := proptools.AppendMatchingProperties(a.generalProperties, + err := proptools.AppendMatchingProperties(m.generalProperties, productVariablePropertyValue.Addr().Interface(), nil) if err != nil { if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok { |