Snap for 11973804 from 6d13ab0b7f to 24Q3-release

Change-Id: I1bef68febc4a150ed123265cc1c388773b1988ae

parser/printer.go

@@ -227,7 +227,7 @@ func (p *printer) printSelect(s *Select) {
 		} else {
 			p.printExpression(c.Value)
 		}
-		p.printToken(",", c.Value.Pos())
+		p.printToken(",", c.Value.End())
 	}
 	p.requestNewline()
 	p.unindent(s.RBracePos)

parser/printer_test.go

@@ -696,6 +696,43 @@ foo {
         (default, default): "b",
     }),
 }
+`,
+	},
+	{
+		name: "Select with multiline inner expression",
+		input: `
+foo {
+    cflags: [
+        "-DPRODUCT_COMPATIBLE_PROPERTY",
+        "-DRIL_SHLIB",
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ] + select(soong_config_variable("sim", "sim_count"), {
+        "2": [
+            "-DANDROID_MULTI_SIM",
+            "-DANDROID_SIM_COUNT_2",
+        ],
+        default: [],
+    }),
+}
+`,
+		output: `
+foo {
+    cflags: [
+        "-DPRODUCT_COMPATIBLE_PROPERTY",
+        "-DRIL_SHLIB",
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+    ] + select(soong_config_variable("sim", "sim_count"), {
+        "2": [
+            "-DANDROID_MULTI_SIM",
+            "-DANDROID_SIM_COUNT_2",
+        ],
+        default: [],
+    }),
+}
 `,
 	},
 }

proptools/configurable.go

@@ -296,7 +296,7 @@ func NewConfigurableCase[T ConfigurableElements](patterns []ConfigurablePattern,
 	patterns = slices.Clone(patterns)
 	return ConfigurableCase[T]{
 		patterns: patterns,
-		value:    copyConfiguredValue(value),
+		value:    copyConfiguredValuePtr(value),
 	}
 }
 
@@ -408,6 +408,22 @@ func NewConfigurable[T ConfigurableElements](conditions []ConfigurableCondition,
 	}
 }
 
+func (c *Configurable[T]) AppendSimpleValue(value T) {
+	value = copyConfiguredValue(value)
+	// This may be a property that was never initialized from a bp file
+	if c.inner == nil {
+		c.inner = &configurableInner[T]{
+			single: singleConfigurable[T]{
+				cases: []ConfigurableCase[T]{{
+					value: &value,
+				}},
+			},
+		}
+		return
+	}
+	c.inner.appendSimpleValue(value)
+}
+
 // Get returns the final value for the configurable property.
 // A configurable property may be unset, in which case Get will return nil.
 func (c *Configurable[T]) Get(evaluator ConfigurableEvaluator) ConfigurableOptional[T] {
@@ -420,7 +436,7 @@ func (c *Configurable[T]) GetOrDefault(evaluator ConfigurableEvaluator, defaultV
 	result := c.inner.evaluate(c.propertyName, evaluator)
 	if result != nil {
 		// Copy the result so that it can't be changed from soong
-		return copyAndDereferenceConfiguredValue(result)
+		return copyConfiguredValue(*result)
 	}
 	return defaultValue
 }
@@ -628,6 +644,21 @@ func (c *configurableInner[T]) setAppend(append *configurableInner[T], replace b
 	}
 }
 
+func (c *configurableInner[T]) appendSimpleValue(value T) {
+	if c.next == nil {
+		c.replace = false
+		c.next = &configurableInner[T]{
+			single: singleConfigurable[T]{
+				cases: []ConfigurableCase[T]{{
+					value: &value,
+				}},
+			},
+		}
+	} else {
+		c.next.appendSimpleValue(value)
+	}
+}
+
 func (c Configurable[T]) printfInto(value string) error {
 	return c.inner.printfInto(value)
 }
@@ -754,7 +785,7 @@ func (c Configurable[T]) configuredType() reflect.Type {
 	return reflect.TypeOf((*T)(nil)).Elem()
 }
 
-func copyConfiguredValue[T ConfigurableElements](t *T) *T {
+func copyConfiguredValuePtr[T ConfigurableElements](t *T) *T {
 	if t == nil {
 		return nil
 	}
@@ -781,12 +812,12 @@ func configuredValuePtrToOptional[T ConfigurableElements](t *T) ConfigurableOpti
 	}
 }
 
-func copyAndDereferenceConfiguredValue[T ConfigurableElements](t *T) T {
-	switch t2 := any(*t).(type) {
+func copyConfiguredValue[T ConfigurableElements](t T) T {
+	switch t2 := any(t).(type) {
 	case []string:
 		return any(slices.Clone(t2)).(T)
 	default:
-		return *t
+		return t
 	}
 }