tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove obsolete dexpreopt config option UseArtImage.

Browse source 
Bug: 170935728
Test: lunch aosp_cf_x86_64_phone-userdebug && m && lunch_cvd
Change-Id: Id83b9085794fd2ec338077ca909f84e04ccad041
This commit is contained in:
Ulya Trafimovich 2022-04-20 10:53:26 +01:00
parent 77b99b097b
commit 442ec7fc07
3 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dexpreopt/config.go
View file

@ -36,8 +36,6 @@ type GlobalConfig struct {
PreoptWithUpdatableBcp bool // If updatable boot jars are included in dexpreopt or not. 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 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 PatternsOnSystemOther []string // patterns (using '%' to denote a prefix match) to put odex on the system_other partition

4
java/dexpreopt.go
View file

@ -259,10 +259,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
isSystemServerJar := global.AllSystemServerJars(ctx).ContainsJar(moduleName(ctx)) isSystemServerJar := global.AllSystemServerJars(ctx).ContainsJar(moduleName(ctx))
bootImage := defaultBootImageConfig(ctx) bootImage := defaultBootImageConfig(ctx)
if global.UseArtImage {
bootImage = artBootImageConfig(ctx)
}
dexFiles, dexLocations := bcpForDexpreopt(ctx, global.PreoptWithUpdatableBcp) dexFiles, dexLocations := bcpForDexpreopt(ctx, global.PreoptWithUpdatableBcp)
targets := ctx.MultiTargets() targets := ctx.MultiTargets()

13
java/dexpreopt_bootjars.go
View file

@ -213,12 +213,6 @@ import (
// writes out a few DEXPREOPT_IMAGE_* variables for Make; these variables contain boot image names, // writes out a few DEXPREOPT_IMAGE_* variables for Make; these variables contain boot image names,
// paths and so on. // 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{ var artApexNames = []string{
"com.android.art", "com.android.art",
@ -938,11 +932,8 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) {
ctx.Strict("DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS", strings.Join(dexLocations, " ")) ctx.Strict("DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS", strings.Join(dexLocations, " "))
var imageNames []string var imageNames []string
// TODO: the primary ART boot image should not be exposed to Make, as it is installed in a // The primary ART boot image is exposed to Make for testing (gtests) and benchmarking
// different way as a part of the ART APEX. However, there is a special JIT-Zygote build // (golem) purposes.
// 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.
for _, current := range append(d.otherImages, image) { for _, current := range append(d.otherImages, image) {
imageNames = append(imageNames, current.name) imageNames = append(imageNames, current.name)
for _, variant := range current.variants { for _, variant := range current.variants {