StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PreoptExtractedApk.

Browse Source 
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:
Jiakai Zhang
2023-11-28 13:38:23 +00:00
parent 359611c1df
commit db93553b02
4 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dexpreopt/config.go
View File

@@ -184,8 +184,6 @@ type ModuleConfig struct {
PreoptBootClassPathDexFiles android.Paths // file paths of boot class path files PreoptBootClassPathDexFiles android.Paths // file paths of boot class path files
PreoptBootClassPathDexLocations []string // virtual locations of boot class path files PreoptBootClassPathDexLocations []string // virtual locations of boot class path files
PreoptExtractedApk bool // Overrides OnlyPreoptModules
NoCreateAppImage bool NoCreateAppImage bool
ForceCreateAppImage bool ForceCreateAppImage bool

2
dexpreopt/dexpreopt.go
View File

@@ -124,7 +124,7 @@ func dexpreoptDisabled(ctx android.PathContext, global *GlobalConfig, module *Mo
return true return true
} }
if global.OnlyPreoptArtBootImage && !module.PreoptExtractedApk { if global.OnlyPreoptArtBootImage {
return true return true
} }

1
dexpreopt/dexpreopt_test.go
View File

@@ -87,7 +87,6 @@ func createTestModuleConfig(name, dexLocation string, buildPath, dexPath, enforc
DexPreoptImageLocationsOnHost: []string{}, DexPreoptImageLocationsOnHost: []string{},
PreoptBootClassPathDexFiles: nil, PreoptBootClassPathDexFiles: nil,
PreoptBootClassPathDexLocations: nil, PreoptBootClassPathDexLocations: nil,
PreoptExtractedApk: false,
NoCreateAppImage: false, NoCreateAppImage: false,
ForceCreateAppImage: false, ForceCreateAppImage: false,
PresignedPrebuilt: false, PresignedPrebuilt: false,

2
java/dexpreopt.go
View File

@@ -374,8 +374,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
PreoptBootClassPathDexFiles: dexFiles.Paths(), PreoptBootClassPathDexFiles: dexFiles.Paths(),
PreoptBootClassPathDexLocations: dexLocations, PreoptBootClassPathDexLocations: dexLocations,
PreoptExtractedApk: false,
NoCreateAppImage: !BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, true), NoCreateAppImage: !BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, true),
ForceCreateAppImage: BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, false), ForceCreateAppImage: BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, false),