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

Merge "Make makevars deterministic"

Browse Source 
am: a88fbdef78

Change-Id: I3049dbbf63e9f889734a6d24e147a4024a1f03a3
This commit is contained in:
Colin Cross
2019-04-15 18:03:41 -07:00
committed by android-build-merger
parent e71c0691ad a88fbdef78
commit 4315944c16
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/dexpreopt_bootjars.go
View File

@@ -469,7 +469,14 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) {
var imageNames []string var imageNames []string
for _, current := range append(d.otherImages, image) { for _, current := range append(d.otherImages, image) {
imageNames = append(imageNames, current.name) imageNames = append(imageNames, current.name)
var arches []android.ArchType
for arch, _ := range current.images { 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_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_"+current.name+"_"+arch.String(), current.images[arch].String())
ctx.Strict("DEXPREOPT_IMAGE_BUILT_INSTALLED_"+current.name+"_"+arch.String(), current.installs[arch].String()) ctx.Strict("DEXPREOPT_IMAGE_BUILT_INSTALLED_"+current.name+"_"+arch.String(), current.installs[arch].String())