diff options
| author | Simon Shields <simon@lineageos.org> | 2017-09-04 21:09:10 +1000 |
|---|---|---|
| committer | Rashed Abdel-Tawab <rashed@linux.com> | 2017-10-28 14:13:26 -0700 |
| commit | 0f826a8854af92547f098dd6adbb2741368bce47 (patch) | |
| tree | 84b2400473bd9eda9741a27bfa60e5259394b284 | |
| parent | 4848b23ccc44a246b67e3f1d87addbea815fa88a (diff) | |
| download | build_soong-0f826a8854af92547f098dd6adbb2741368bce47.tar.gz build_soong-0f826a8854af92547f098dd6adbb2741368bce47.tar.bz2 build_soong-0f826a8854af92547f098dd6adbb2741368bce47.zip | |
soong: add support for nested structs in variableProperties
Change-Id: I0e5395ac70220f1d3a1c87c6112e33f84f526fea
| -rw-r--r-- | android/variable.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go index 331d4f39..cd80a587 100644 --- a/android/variable.go +++ b/android/variable.go @@ -221,7 +221,14 @@ 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().(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) @@ -229,8 +236,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().(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 } |