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

Commit c1218f39 authored by Jeongik Cha's avatar Jeongik Cha Committed by Gerrit Code Review
Browse files

Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost"

parents 31b66c76 e3165c8d

java/dexpreopt_bootjars.go

+3 −2
Original line number Diff line number Diff line
@@ -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_UNSTRIPPED_BUILT_INSTALLED_"+sfx, variant.unstrippedInstalls.String())

			}

			imageLocationsOnHost, _ := current.getAnyAndroidVariant().imageLocations()

			ctx.Strict("DEXPREOPT_IMAGE_LOCATIONS_"+current.name, strings.Join(imageLocationsOnHost, ":"))

			imageLocationsOnHost, imageLocationsOnDevice := current.getAnyAndroidVariant().imageLocations()

			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_NAMES", strings.Join(imageNames, " "))