From 442ec7fc07d5c622291cb836b8e38c760065d2df Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Wed, 20 Apr 2022 10:53:26 +0100 Subject: [PATCH] Remove obsolete dexpreopt config option `UseArtImage`. Bug: 170935728 Test: lunch aosp_cf_x86_64_phone-userdebug && m && lunch_cvd Change-Id: Id83b9085794fd2ec338077ca909f84e04ccad041 --- dexpreopt/config.go | 2 -- java/dexpreopt.go | 4 ---- java/dexpreopt_bootjars.go | 13 ++----------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dexpreopt/config.go b/dexpreopt/config.go index 153b0256f..ab9e418a0 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -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 diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 7c5f055e6..0adaf9917 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -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() diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 3d91aec91..7c4da3ef6 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -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 {