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

Commit af7c2fcb authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Export art dexpreopt image zip file"

parents 5eb62bc2 31bf00da

java/dexpreopt_bootjars.go

+3 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ func (d *dexpreoptBootJars) GenerateBuildActions(ctx android.SingletonContext) { 
	// Always create the default boot image first, to get a unique profile rule for all images.

	d.defaultBootImage = buildBootImage(ctx, defaultBootImageConfig(ctx))

	// Create boot image for the ART apex (build artifacts are accessed via the global boot image config).

	buildBootImage(ctx, artBootImageConfig(ctx))

	d.otherImages = append(d.otherImages, buildBootImage(ctx, artBootImageConfig(ctx)))

	if global.GenerateApexImage {

		// Create boot images for the JIT-zygote experiment.

		d.otherImages = append(d.otherImages, buildBootImage(ctx, apexBootImageConfig(ctx)))
@@ -598,7 +598,6 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) { 
		ctx.Strict("DEXPREOPT_BOOTCLASSPATH_DEX_FILES", strings.Join(image.dexPathsDeps.Strings(), " "))

		ctx.Strict("DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS", strings.Join(image.dexLocationsDeps, " "))

		ctx.Strict("DEXPREOPT_IMAGE_LOCATIONS", strings.Join(image.imageLocations, ":"))

		ctx.Strict("DEXPREOPT_IMAGE_ZIP_"+image.name, image.zip.String())



		var imageNames []string

		for _, current := range append(d.otherImages, image) {
@@ -619,6 +618,8 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) { 
				if current.zip != nil {

				}

			}



			ctx.Strict("DEXPREOPT_IMAGE_ZIP_"+current.name, current.zip.String())

		}

		ctx.Strict("DEXPREOPT_IMAGE_NAMES", strings.Join(imageNames, " "))

	}

java/dexpreopt_config.go

+2 −1
Original line number Diff line number Diff line
@@ -226,12 +226,13 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
				c.images[arch] = imageDir.Join(ctx, imageName)

				c.imagesDeps[arch] = c.moduleFiles(ctx, imageDir, ".art", ".oat", ".vdex")

			}



			c.zip = c.dir.Join(ctx, c.name+".zip")

		}



		// specific to the framework config

		frameworkCfg.dexPathsDeps = append(artCfg.dexPathsDeps, frameworkCfg.dexPathsDeps...)

		frameworkCfg.imageLocations = append(artCfg.imageLocations, frameworkCfg.imageLocations...)

		frameworkCfg.zip = frameworkCfg.dir.Join(ctx, frameworkCfg.stem+".zip")



		return configs

	}).(map[string]*bootImageConfig)