Make makevars deterministic
Sort map keys before iterating over them to produce makevars.
Bug: 130411407
Test: m checkbuild
Change-Id: I4153977705da05a5c73e641f93d02f408209c897
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index e857fe8..cb2ea9f 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -469,7 +469,14 @@
var imageNames []string
for _, current := range append(d.otherImages, image) {
imageNames = append(imageNames, current.name)
+ var arches []android.ArchType
for arch, _ := range current.images {
+ arches = append(arches, arch)
+ }
+
+ sort.Slice(arches, func(i, j int) bool { return arches[i].String() < arches[j].String() })
+
+ for _, arch := range arches {
ctx.Strict("DEXPREOPT_IMAGE_VDEX_BUILT_INSTALLED_"+current.name+"_"+arch.String(), current.vdexInstalls[arch].String())
ctx.Strict("DEXPREOPT_IMAGE_"+current.name+"_"+arch.String(), current.images[arch].String())
ctx.Strict("DEXPREOPT_IMAGE_BUILT_INSTALLED_"+current.name+"_"+arch.String(), current.installs[arch].String())