diff options
| author | 2024-11-13 01:00:57 +0000 | |
|---|---|---|
| committer | 2024-11-13 01:00:57 +0000 | |
| commit | 47dadd9d685b378ebbaf1ff3da40070c66edffb6 (patch) | |
| tree | 2232df665f52e4279a2b9c8ddab008c2248b2f69 | |
| parent | d74a6afaa51c6c18dd5592a6da42b4bbdf59f619 (diff) | |
Fix non determinism in prebuilt_* modules generation
Ensures that the generated modules' properties are deterministic by
iterating the map in a sorted manner.
Test: m nothing
Bug: 378760592
Change-Id: Ibe6fd753372e65ddda30f12201747d88421165fd
| -rw-r--r-- | fsgen/prebuilt_etc_modules_gen.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fsgen/prebuilt_etc_modules_gen.go b/fsgen/prebuilt_etc_modules_gen.go index 73fb8d70d..97d5482cb 100644 --- a/fsgen/prebuilt_etc_modules_gen.go +++ b/fsgen/prebuilt_etc_modules_gen.go @@ -279,7 +279,8 @@ func createPrebuiltEtcModulesInDirectory(ctx android.LoadHookContext, partition, for fileIndex := range maxLen { srcTuple := []srcBaseFileInstallBaseFileTuple{} - for _, groupedDestFile := range groupedDestFiles { + for _, srcFile := range android.SortedKeys(groupedDestFiles) { + groupedDestFile := groupedDestFiles[srcFile] if len(groupedDestFile) > fileIndex { srcTuple = append(srcTuple, groupedDestFile[fileIndex]) } |