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

Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost" am: c1218f395c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744553

Change-Id: I97744f93f9becea296affa1d2a29a2146075ec8b
This commit is contained in:
Jeongik Cha
2021-06-24 00:18:09 +00:00
committed by Automerger Merge Worker
parent 15102f14d9 c1218f395c
commit e40749a1b6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/dexpreopt_bootjars.go
View File

@@ -884,8 +884,9 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) {
ctx.Strict("DEXPREOPT_IMAGE_BUILT_INSTALLED_"+sfx, variant.installs.String()) ctx.Strict("DEXPREOPT_IMAGE_BUILT_INSTALLED_"+sfx, variant.installs.String())
ctx.Strict("DEXPREOPT_IMAGE_UNSTRIPPED_BUILT_INSTALLED_"+sfx, variant.unstrippedInstalls.String()) ctx.Strict("DEXPREOPT_IMAGE_UNSTRIPPED_BUILT_INSTALLED_"+sfx, variant.unstrippedInstalls.String())
} }
imageLocationsOnHost, _ := current.getAnyAndroidVariant().imageLocations() imageLocationsOnHost, imageLocationsOnDevice := current.getAnyAndroidVariant().imageLocations()
ctx.Strict("DEXPREOPT_IMAGE_LOCATIONS_"+current.name, strings.Join(imageLocationsOnHost, ":")) ctx.Strict("DEXPREOPT_IMAGE_LOCATIONS_ON_HOST"+current.name, strings.Join(imageLocationsOnHost, ":"))
ctx.Strict("DEXPREOPT_IMAGE_LOCATIONS_ON_DEVICE"+current.name, strings.Join(imageLocationsOnDevice, ":"))
ctx.Strict("DEXPREOPT_IMAGE_ZIP_"+current.name, current.zip.String()) ctx.Strict("DEXPREOPT_IMAGE_ZIP_"+current.name, current.zip.String())
} }
ctx.Strict("DEXPREOPT_IMAGE_NAMES", strings.Join(imageNames, " ")) ctx.Strict("DEXPREOPT_IMAGE_NAMES", strings.Join(imageNames, " "))