diff options
| author | Simon Shields <simon@lineageos.org> | 2017-09-04 21:09:10 +1000 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 19:03:32 +0200 |
| commit | 7256e0235a436e8b2033b18e5add243d9d42706c (patch) | |
| tree | b99f3e56cb8fdc00593c514f73bfb9d1b363cdfa | |
| parent | 5191af565c2e81cece5dc846c608210cb9af9efc (diff) | |
| download | build_soong-7256e0235a436e8b2033b18e5add243d9d42706c.tar.gz build_soong-7256e0235a436e8b2033b18e5add243d9d42706c.tar.bz2 build_soong-7256e0235a436e8b2033b18e5add243d9d42706c.zip | |
soong: add support for nested structs in variableProperties
Change-Id: I0e5395ac70220f1d3a1c87c6112e33f84f526fea
| -rw-r--r-- | android/variable.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go index a30a423e..56fdcc18 100644 --- a/android/variable.go +++ b/android/variable.go @@ -354,7 +354,13 @@ func variableMutator(mctx BottomUpMutatorContext) { a := module.base() variableValues := reflect.ValueOf(&a.variableProperties.Product_variables).Elem() zeroValues := reflect.ValueOf(zeroProductVariables.Product_variables) + valStruct := reflect.ValueOf(mctx.Config().productVariables) + doVariableMutation(mctx, a, variableValues, zeroValues, valStruct) +} + +func doVariableMutation(mctx BottomUpMutatorContext, a *ModuleBase, variableValues reflect.Value, zeroValues reflect.Value, + valStruct reflect.Value) { for i := 0; i < variableValues.NumField(); i++ { variableValue := variableValues.Field(i) zeroValue := zeroValues.Field(i) @@ -362,8 +368,11 @@ func variableMutator(mctx BottomUpMutatorContext) { property := "product_variables." + proptools.PropertyNameForField(name) // Check that the variable was set for the product - val := reflect.ValueOf(mctx.Config().productVariables).FieldByName(name) - if !val.IsValid() || val.Kind() != reflect.Ptr || val.IsNil() { + val := valStruct.FieldByName(name) + if val.IsValid() && val.Kind() == reflect.Struct { + doVariableMutation(mctx, a, variableValue, zeroValue, val) + continue + } else if !val.IsValid() || val.Kind() != reflect.Ptr || val.IsNil() { continue } |