diff options
| author | 2025-03-20 11:01:40 -0700 | |
|---|---|---|
| committer | 2025-03-20 11:01:40 -0700 | |
| commit | 8c31132dba8e206387296ec2a9d850832794d9b4 (patch) | |
| tree | cb888af41cf7962e5243791334e27beb1d7007b0 /android | |
| parent | 3249d6c439c1348654703e3a23a31463d1dc2982 (diff) | |
| parent | c8957ccdcacf15bb5441bcf53171f6caea436971 (diff) | |
Merge "Make the order of cases stable when creating new configurables. Otherwise the properties hash values will change randomly." into main am: c8957ccdca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3551043
Change-Id: Ifbc94944075c3f968ba0c07e044b7d572a81d3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/configurable_properties.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/configurable_properties.go b/android/configurable_properties.go index 2c794a186..bde33e99b 100644 --- a/android/configurable_properties.go +++ b/android/configurable_properties.go @@ -7,7 +7,8 @@ import "github.com/google/blueprint/proptools" // to indicate a "default" case. func CreateSelectOsToBool(cases map[string]*bool) proptools.Configurable[bool] { var resultCases []proptools.ConfigurableCase[bool] - for pattern, value := range cases { + for _, pattern := range SortedKeys(cases) { + value := cases[pattern] if pattern == "" { resultCases = append(resultCases, proptools.NewConfigurableCase( []proptools.ConfigurablePattern{proptools.NewDefaultConfigurablePattern()}, |