diff options
| author | mosimchah <mosimchah@gmail.com> | 2025-12-02 09:27:38 -0500 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2025-12-02 09:27:38 -0500 |
| commit | c7bade461dc55726f62997d13a48582f7c4b4655 (patch) | |
| tree | ea0588da76060a2038f54f67efd046ca77634b10 /android/selects_test.go | |
| parent | 0f5414d19317805e8bbbe7c4db5f0fd78769bad5 (diff) | |
| parent | 89d78cff8b00d3b20a90074635c3fe5a2ee49474 (diff) | |
Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1
* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
Revert "install_symlink: Make symlink target configurable"
Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
Revert "rust: config: Fix missing CPU variant LD flags in Rust"
Rename build-flag in outdir
Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
Convert check-vintf-all to phony with actions
Create a partial implementation of check-vintf-all for soong-only
Configure RBE rust pool based on build variant
Revert^3 "Add sdk version check to arr"
Add jdk.internal.invoke to the allowlist
Make droid always depend on symbols zip
Import Device and Odm skus
Don't install gob_gen in Soong
Remove bazel reference from run_integration_tests.sh
Fix bootstrap_test.sh
Don't panic in aconfig libraries when AllowMissingDependencies is set
Avoid returning nil paths from PathForModuleSrc
Revert "Flag controled clang version"
Rework module target dependencies on required deps
Revert^2 "Add sdk version check to arr"
...
Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de
Diffstat (limited to 'android/selects_test.go')
| -rw-r--r-- | android/selects_test.go | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/android/selects_test.go b/android/selects_test.go index 8e469f8e3..c3dc5c84e 100644 --- a/android/selects_test.go +++ b/android/selects_test.go @@ -770,7 +770,7 @@ func TestSelects(t *testing.T) { }), } `, - expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_bool"`, + expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_bool". This requires a small soong change to enable`, }, { name: "Assigning select to nonconfigurable string", @@ -783,7 +783,7 @@ func TestSelects(t *testing.T) { }), } `, - expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_string"`, + expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_string". This requires a small soong change to enable`, }, { name: "Assigning appended selects to nonconfigurable string", @@ -799,7 +799,7 @@ func TestSelects(t *testing.T) { }), } `, - expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_string"`, + expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_string". This requires a small soong change to enable`, }, { name: "Assigning select to nonconfigurable string list", @@ -812,7 +812,20 @@ func TestSelects(t *testing.T) { }), } `, - expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_string_list"`, + expectedError: `can't assign select statement to non-configurable property "my_nonconfigurable_string_list". This requires a small soong change to enable`, + }, + { + name: "Assigning select to defaults property", + bp: ` + my_module_type { + name: "foo", + defaults: select(soong_config_variable("foo", "bar"), { + "x": ["foo"], + default: [], + }), + } + `, + expectedError: `can't assign select statement to non-configurable property "defaults". We explicitly don't support selects on this property`, }, { name: "Select in variable", |
