openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Use the full dexpreopt boot classpath when preopting with other images." am: ce93e3c672 

am: 9ca94c7872

Change-Id: Ia01a517be9cb42151a8e57e391a72ff482935219
This commit is contained in:
Nicolas Geoffray 2019-04-09 00:20:55 -07:00 committed by android-build-merger
parent d20a62f8e1 9ca94c7872
commit 6deaa031ab
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/dexpreopt.go
View File

@ -98,6 +98,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
global := dexpreoptGlobalConfig(ctx) global := dexpreoptGlobalConfig(ctx)
bootImage := defaultBootImageConfig(ctx) bootImage := defaultBootImageConfig(ctx)
defaultBootImage := bootImage
if global.UseApexImage { if global.UseApexImage {
bootImage = apexBootImageConfig(ctx) bootImage = apexBootImageConfig(ctx)
} }
@ -165,8 +166,11 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
Archs: archs, Archs: archs,
DexPreoptImages: images, DexPreoptImages: images,
PreoptBootClassPathDexFiles: bootImage.dexPaths.Paths(), // We use the dex paths and dex locations of the default boot image, as it
PreoptBootClassPathDexLocations: bootImage.dexLocations, // contains the full dexpreopt boot classpath. Other images may just contain a subset of
// the dexpreopt boot classpath.
PreoptBootClassPathDexFiles: defaultBootImage.dexPaths.Paths(),
PreoptBootClassPathDexLocations: defaultBootImage.dexLocations,
PreoptExtractedApk: false, PreoptExtractedApk: false,