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

Merge "Remove PreoptExtractedApk." into main am: ba45ba5763 am: c6c66b193c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255

Change-Id: I9971ebbb3a4608936238b375e3a6c7d9b1770ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiakai Zhang
2023-11-29 11:23:26 +00:00
committed by Automerger Merge Worker
parent 5e125d2c56 c6c66b193c
commit 0b4994ea92
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),