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

Merge "Support dexpreopt against the primary boot image."

Browse Source
This commit is contained in:
Vladimir Marko
2020-02-07 14:12:52 +00:00
committed by Gerrit Code Review
parent f3c9d74cfa 40139d6422
commit 396b950a1b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dexpreopt/config.go
View File

@@ -30,6 +30,8 @@ type GlobalConfig struct {
OnlyPreoptBootImageAndSystemServer bool // only preopt jars in the boot image or system server OnlyPreoptBootImageAndSystemServer bool // only preopt jars in the boot image or system server
UseArtImage bool // use the art image (use other boot class path dex files without image)
GenerateApexImage bool // generate an extra boot image only containing jars from the runtime apex GenerateApexImage bool // generate an extra boot image only containing jars from the runtime apex
UseApexImage bool // use the apex image by default UseApexImage bool // use the apex image by default

14
java/dexpreopt.go
View File

@@ -106,8 +106,18 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
global := dexpreoptGlobalConfig(ctx) global := dexpreoptGlobalConfig(ctx)
bootImage := defaultBootImageConfig(ctx) bootImage := defaultBootImageConfig(ctx)
dexFiles := bootImage.dexPathsDeps.Paths()
dexLocations := bootImage.dexLocationsDeps
if global.UseArtImage {
bootImage = artBootImageConfig(ctx)
}
if global.UseApexImage { if global.UseApexImage {
bootImage = frameworkJZBootImageConfig(ctx) bootImage = frameworkJZBootImageConfig(ctx)
dexFiles = bootImage.dexPathsDeps.Paths()
dexLocations = bootImage.dexLocationsDeps
if global.UseArtImage {
bootImage = artJZBootImageConfig(ctx)
}
} }
var archs []android.ArchType var archs []android.ArchType
@@ -178,8 +188,8 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
DexPreoptImagesDeps: imagesDeps, DexPreoptImagesDeps: imagesDeps,
DexPreoptImageLocations: bootImage.imageLocations, DexPreoptImageLocations: bootImage.imageLocations,
PreoptBootClassPathDexFiles: bootImage.dexPathsDeps.Paths(), PreoptBootClassPathDexFiles: dexFiles,
PreoptBootClassPathDexLocations: bootImage.dexLocationsDeps, PreoptBootClassPathDexLocations: dexLocations,
PreoptExtractedApk: false, PreoptExtractedApk: false,