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

Commit 442ec7fc authored by Ulya Trafimovich's avatar Ulya Trafimovich
Browse files

Remove obsolete dexpreopt config option `UseArtImage`. 

Bug: 170935728
Test: lunch aosp_cf_x86_64_phone-userdebug && m && lunch_cvd
Change-Id: Id83b9085794fd2ec338077ca909f84e04ccad041
parent 77b99b09

dexpreopt/config.go

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ type GlobalConfig struct { 


	PreoptWithUpdatableBcp bool // If updatable boot jars are included in dexpreopt or not.



	UseArtImage bool // use the art image (use other boot class path dex files without image)



	HasSystemOther        bool     // store odex files that match PatternsOnSystemOther on the system_other partition

	PatternsOnSystemOther []string // patterns (using '%' to denote a prefix match) to put odex on the system_other partition

java/dexpreopt.go

+0 −4
Original line number Diff line number Diff line
@@ -259,10 +259,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr 
	isSystemServerJar := global.AllSystemServerJars(ctx).ContainsJar(moduleName(ctx))



	bootImage := defaultBootImageConfig(ctx)

	if global.UseArtImage {

		bootImage = artBootImageConfig(ctx)

	}



	dexFiles, dexLocations := bcpForDexpreopt(ctx, global.PreoptWithUpdatableBcp)



	targets := ctx.MultiTargets()

java/dexpreopt_bootjars.go

+2 −11
Original line number Diff line number Diff line
@@ -213,12 +213,6 @@ import ( 
// writes out a few DEXPREOPT_IMAGE_* variables for Make; these variables contain boot image names,

// paths and so on.

//

// 2.5. JIT-Zygote configuration

// -----------------------------

//

// One special configuration is JIT-Zygote build, when the primary ART image is used for compiling

// apps instead of the Framework boot image extension (see DEXPREOPT_USE_ART_IMAGE and UseArtImage).

//



var artApexNames = []string{

	"com.android.art",
@@ -938,11 +932,8 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) { 
		ctx.Strict("DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS", strings.Join(dexLocations, " "))



		var imageNames []string

		// TODO: the primary ART boot image should not be exposed to Make, as it is installed in a

		// different way as a part of the ART APEX. However, there is a special JIT-Zygote build

		// configuration which uses the primary ART image instead of the Framework boot image

		// extension, and it relies on the ART image being exposed to Make. To fix this, it is

		// necessary to rework the logic in makefiles.

		// The primary ART boot image is exposed to Make for testing (gtests) and benchmarking

		// (golem) purposes.

		for _, current := range append(d.otherImages, image) {

			imageNames = append(imageNames, current.name)

			for _, variant := range current.variants {