diff options
| author | Colin Cross <ccross@android.com> | 2019-04-11 14:07:04 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-16 14:50:10 -0700 |
| commit | 1bdf650bb18df19011fa4eb80d3741cf7979086e (patch) | |
| tree | 511af7d1e3f23e161700c48674a236741ca12dda /java | |
| parent | 5e037c38d3ce8f9bba5b5cea927c0058ba467c61 (diff) | |
| download | build_soong-1bdf650bb18df19011fa4eb80d3741cf7979086e.tar.gz build_soong-1bdf650bb18df19011fa4eb80d3741cf7979086e.tar.bz2 build_soong-1bdf650bb18df19011fa4eb80d3741cf7979086e.zip | |
Make makevars deterministic
Sort map keys before iterating over them to produce makevars.
Bug: 130411407
Test: m checkbuild
Change-Id: I4153977705da05a5c73e641f93d02f408209c897
Merged-In: I4153977705da05a5c73e641f93d02f408209c897
(cherry picked from commit 91268c668ce952baee0d5ddb922b7b4c8ddd5b1d)
Diffstat (limited to 'java')
| -rw-r--r-- | java/dexpreopt_bootjars.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index a23b477a..4d87b2f7 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -447,7 +447,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()) |