diff options
| author | Jiakai Zhang <jiakaiz@google.com> | 2023-11-28 13:38:23 +0000 |
|---|---|---|
| committer | Jiakai Zhang <jiakaiz@google.com> | 2023-11-28 13:40:58 +0000 |
| commit | db93553b0252def7889bcca3133aeb7dc14b6777 (patch) | |
| tree | 5bd93123cc5963ac15097a8f76d3a0b87b018152 /dexpreopt | |
| parent | 359611c1dfb1b35779c0226d5811eb67e39a1074 (diff) | |
Remove PreoptExtractedApk.
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.
Bug: 313505540
Test: m
Change-Id: I605b7569c17ee715cd4df167768e25aaf51bcd37
Diffstat (limited to 'dexpreopt')
| -rw-r--r-- | dexpreopt/config.go | 2 | ||||
| -rw-r--r-- | dexpreopt/dexpreopt.go | 2 | ||||
| -rw-r--r-- | dexpreopt/dexpreopt_test.go | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/dexpreopt/config.go b/dexpreopt/config.go index c871e85bf..61639521e 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -184,8 +184,6 @@ type ModuleConfig struct { PreoptBootClassPathDexFiles android.Paths // file paths of boot class path files PreoptBootClassPathDexLocations []string // virtual locations of boot class path files - PreoptExtractedApk bool // Overrides OnlyPreoptModules - NoCreateAppImage bool ForceCreateAppImage bool diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index c13e14ad2..94707bafa 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -124,7 +124,7 @@ func dexpreoptDisabled(ctx android.PathContext, global *GlobalConfig, module *Mo return true } - if global.OnlyPreoptArtBootImage && !module.PreoptExtractedApk { + if global.OnlyPreoptArtBootImage { return true } diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go index 2b19c9db5..230fbb4de 100644 --- a/dexpreopt/dexpreopt_test.go +++ b/dexpreopt/dexpreopt_test.go @@ -87,7 +87,6 @@ func createTestModuleConfig(name, dexLocation string, buildPath, dexPath, enforc DexPreoptImageLocationsOnHost: []string{}, PreoptBootClassPathDexFiles: nil, PreoptBootClassPathDexLocations: nil, - PreoptExtractedApk: false, NoCreateAppImage: false, ForceCreateAppImage: false, PresignedPrebuilt: false, |