Support %s in product variable properties
Support using strings as product variable substitutions, and
add tests for printfIntoProperty.
Test: varaible_test.go
Change-Id: I06cfadfb1d3fc81da72fb71323706df20426c8b7
diff --git a/android/variable.go b/android/variable.go
index 2d039bd..03c797f 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -230,7 +230,7 @@
func (a *ModuleBase) setVariableProperties(ctx BottomUpMutatorContext,
prefix string, productVariablePropertyValue reflect.Value, variableValue interface{}) {
- printfIntoProperties(productVariablePropertyValue, variableValue)
+ printfIntoProperties(ctx, prefix, productVariablePropertyValue, variableValue)
err := proptools.AppendMatchingProperties(a.generalProperties,
productVariablePropertyValue.Addr().Interface(), nil)
@@ -243,7 +243,17 @@
}
}
-func printfIntoProperties(productVariablePropertyValue reflect.Value, variableValue interface{}) {
+func printfIntoPropertiesError(ctx BottomUpMutatorContext, prefix string,
+ productVariablePropertyValue reflect.Value, i int, err error) {
+
+ field := productVariablePropertyValue.Type().Field(i).Name
+ property := prefix + "." + proptools.PropertyNameForField(field)
+ ctx.PropertyErrorf(property, "%s", err)
+}
+
+func printfIntoProperties(ctx BottomUpMutatorContext, prefix string,
+ productVariablePropertyValue reflect.Value, variableValue interface{}) {
+
for i := 0; i < productVariablePropertyValue.NumField(); i++ {
propertyValue := productVariablePropertyValue.Field(i)
kind := propertyValue.Kind()
@@ -255,36 +265,64 @@
}
switch propertyValue.Kind() {
case reflect.String:
- printfIntoProperty(propertyValue, variableValue)
+ err := printfIntoProperty(propertyValue, variableValue)
+ if err != nil {
+ printfIntoPropertiesError(ctx, prefix, productVariablePropertyValue, i, err)
+ }
case reflect.Slice:
for j := 0; j < propertyValue.Len(); j++ {
- printfIntoProperty(propertyValue.Index(j), variableValue)
+ err := printfIntoProperty(propertyValue.Index(j), variableValue)
+ if err != nil {
+ printfIntoPropertiesError(ctx, prefix, productVariablePropertyValue, i, err)
+ }
}
case reflect.Bool:
// Nothing
case reflect.Struct:
- printfIntoProperties(propertyValue, variableValue)
+ printfIntoProperties(ctx, prefix, propertyValue, variableValue)
default:
panic(fmt.Errorf("unsupported field kind %q", propertyValue.Kind()))
}
}
}
-func printfIntoProperty(propertyValue reflect.Value, variableValue interface{}) {
+func printfIntoProperty(propertyValue reflect.Value, variableValue interface{}) error {
s := propertyValue.String()
- // For now, we only support int formats
- var i int
+
+ count := strings.Count(s, "%")
+ if count == 0 {
+ return nil
+ }
+
+ if count > 1 {
+ return fmt.Errorf("product variable properties only support a single '%%'")
+ }
+
if strings.Contains(s, "%d") {
switch v := variableValue.(type) {
case int:
- i = v
+ // Nothing
case bool:
if v {
- i = 1
+ variableValue = 1
+ } else {
+ variableValue = 0
}
default:
- panic(fmt.Errorf("unsupported type %T", variableValue))
+ return fmt.Errorf("unsupported type %T for %%d", variableValue)
}
- propertyValue.Set(reflect.ValueOf(fmt.Sprintf(s, i)))
+ } else if strings.Contains(s, "%s") {
+ switch variableValue.(type) {
+ case string:
+ // Nothing
+ default:
+ return fmt.Errorf("unsupported type %T for %%s", variableValue)
+ }
+ } else {
+ return fmt.Errorf("unsupported %% in product variable property")
}
+
+ propertyValue.Set(reflect.ValueOf(fmt.Sprintf(s, variableValue)))
+
+ return nil
}