Snap for 11881322 from 197f763242 to 24Q3-release

Change-Id: I8ad33c3c017acf5ee9944aca9887eada257cd44f

proptools/configurable.go

@@ -467,6 +467,7 @@ func (c *singleConfigurable[T]) evaluateNonTransitive(propertyName string, evalu
 		values[i] = evaluator.EvaluateConfiguration(condition, propertyName)
 	}
 	foundMatch := false
+	nonMatchingIndex := 0
 	var result *T
 	for _, case_ := range c.cases {
 		allMatch := true
@@ -477,6 +478,7 @@ func (c *singleConfigurable[T]) evaluateNonTransitive(propertyName string, evalu
 			}
 			if !pat.matchesValue(values[i]) {
 				allMatch = false
+				nonMatchingIndex = i
 				break
 			}
 		}
@@ -488,7 +490,8 @@ func (c *singleConfigurable[T]) evaluateNonTransitive(propertyName string, evalu
 	if foundMatch {
 		return result
 	}
-	evaluator.PropertyErrorf(propertyName, "%s had value %s, which was not handled by the select statement", c.conditions, values)
+
+	evaluator.PropertyErrorf(propertyName, "%s had value %s, which was not handled by the select statement", c.conditions[nonMatchingIndex].String(), values[nonMatchingIndex].String())
 	return nil
 }
 
@@ -554,6 +557,7 @@ type configurableReflection interface {
 	configuredType() reflect.Type
 	clone() any
 	isEmpty() bool
+	printfInto(value string) error
 }
 
 // Same as configurableReflection, but since initialize needs to take a pointer
@@ -624,6 +628,60 @@ func (c *configurableInner[T]) setAppend(append *configurableInner[T], replace b
 	}
 }
 
+func (c Configurable[T]) printfInto(value string) error {
+	return c.inner.printfInto(value)
+}
+
+func (c *configurableInner[T]) printfInto(value string) error {
+	for c != nil {
+		if err := c.single.printfInto(value); err != nil {
+			return err
+		}
+		c = c.next
+	}
+	return nil
+}
+
+func (c *singleConfigurable[T]) printfInto(value string) error {
+	for _, c := range c.cases {
+		if c.value == nil {
+			continue
+		}
+		switch v := any(c.value).(type) {
+		case *string:
+			if err := printfIntoString(v, value); err != nil {
+				return err
+			}
+		case *[]string:
+			for i := range *v {
+				if err := printfIntoString(&((*v)[i]), value); err != nil {
+					return err
+				}
+			}
+		}
+	}
+	return nil
+}
+
+func printfIntoString(s *string, configValue string) error {
+	count := strings.Count(*s, "%")
+	if count == 0 {
+		return nil
+	}
+
+	if count > 1 {
+		return fmt.Errorf("list/value variable properties only support a single '%%'")
+	}
+
+	if !strings.Contains(*s, "%s") {
+		return fmt.Errorf("unsupported %% in value variable property")
+	}
+
+	*s = fmt.Sprintf(*s, configValue)
+
+	return nil
+}
+
 func (c Configurable[T]) clone() any {
 	return Configurable[T]{
 		propertyName: c.propertyName,
@@ -731,3 +789,10 @@ func copyAndDereferenceConfiguredValue[T ConfigurableElements](t *T) T {
 		return *t
 	}
 }
+
+// PrintfIntoConfigurable replaces %s occurrences in strings in Configurable properties
+// with the provided string value. It's intention is to support soong config value variables
+// on Configurable properties.
+func PrintfIntoConfigurable(c any, value string) error {
+	return c.(configurableReflection).printfInto(value)
+}