Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91268c66 authored by Colin Cross's avatar Colin Cross
Browse files

Make makevars deterministic 

Sort map keys before iterating over them to produce makevars.

Bug: 130411407
Test: m checkbuild
Change-Id: I4153977705da05a5c73e641f93d02f408209c897
parent 8235220a

java/dexpreopt_bootjars.go

+7 −0
Original line number Diff line number Diff line
@@ -469,7 +469,14 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) { 
		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())