tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: ce93e3c672

Change-Id: I74e0e616c550fe3d3cbbfd40cd7679644b814352
This commit is contained in:
Nicolas Geoffray 2019-04-08 23:59:38 -07:00 committed by android-build-merger
commit 9ca94c7872
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,