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
This commit is contained in:
parent
359611c1df
commit
db93553b02
4 changed files with 1 additions and 6 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -374,8 +374,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
PreoptBootClassPathDexFiles: dexFiles.Paths(),
|
||||
PreoptBootClassPathDexLocations: dexLocations,
|
||||
|
||||
PreoptExtractedApk: false,
|
||||
|
||||
NoCreateAppImage: !BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, true),
|
||||
ForceCreateAppImage: BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, false),
|
||||
|
||||
|
|
Loading…
Reference in a new issue