Merge "Make dirs a configurable property" into main
diff --git a/android/packaging_test.go b/android/packaging_test.go
index 89df8ef..19b46fe 100644
--- a/android/packaging_test.go
+++ b/android/packaging_test.go
@@ -15,7 +15,6 @@
package android
import (
- "fmt"
"strings"
"testing"
@@ -648,7 +647,6 @@
}
bp := strings.Replace(bpTemplate, "%COMPILE_MULTILIB%", tc.compileMultilib, -1)
bp = strings.Replace(bp, "%DEPS%", `["`+strings.Join(tc.deps, `", "`)+`"]`, -1)
- fmt.Printf("bp = %s\n", bp)
runPackagingTest(t, config, bp, tc.expected)
}
}
diff --git a/android/selects_test.go b/android/selects_test.go
index d9499a5..7091566 100644
--- a/android/selects_test.go
+++ b/android/selects_test.go
@@ -688,6 +688,29 @@
`,
expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_string_list"`,
},
+ {
+ name: "Select in variable",
+ bp: `
+ my_second_variable = ["after.cpp"]
+ my_variable = select(soong_config_variable("my_namespace", "my_variable"), {
+ "a": ["a.cpp"],
+ "b": ["b.cpp"],
+ default: ["c.cpp"],
+ }) + my_second_variable
+ my_module_type {
+ name: "foo",
+ my_string_list: ["before.cpp"] + my_variable,
+ }
+ `,
+ provider: selectsTestProvider{
+ my_string_list: &[]string{"before.cpp", "a.cpp", "after.cpp"},
+ },
+ vendorVars: map[string]map[string]string{
+ "my_namespace": {
+ "my_variable": "a",
+ },
+ },
+ },
}
for _, tc := range testCases {