StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't panic when a map is included twice" into main am: 0bcdc1f417

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3087206

Change-Id: I61fb11835f2f0c6ad0faeadeb3b136b7da2a93e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-15 00:24:44 +00:00
committed by Automerger Merge Worker
parent 69ac817342 0bcdc1f417
commit 843d51cb68
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/release_config/release_config_lib/release_configs.go
View File

@@ -439,7 +439,8 @@ func ReadReleaseConfigMaps(releaseConfigMapPaths StringList, targetRelease strin
configs := ReleaseConfigsFactory()
mapsRead := make(map[string]bool)
for idx, releaseConfigMapPath := range releaseConfigMapPaths {
var idx int
for _, releaseConfigMapPath := range releaseConfigMapPaths {
// Maintain an ordered list of release config directories.
configDir := filepath.Dir(releaseConfigMapPath)
if mapsRead[configDir] {
@@ -454,6 +455,7 @@ func ReadReleaseConfigMaps(releaseConfigMapPaths StringList, targetRelease strin
if err != nil {
return nil, err
}
idx += 1
}
// Now that we have all of the release config maps, can meld them and generate the artifacts.