diff options
| author | 2019-04-09 06:04:43 +0000 | |
|---|---|---|
| committer | 2019-04-09 06:04:43 +0000 | |
| commit | ce93e3c672110b37b88e7ed4e1ff815cfa825c1a (patch) | |
| tree | 8475f1e53bf5b3096a076dfef59ae2218d76ad85 | |
| parent | 0975ee0de3d2befefa613754b4dd684a1a9b8c0e (diff) | |
| parent | 06758a7e13d2fe26bc8e2798bba21dd85e4cd2de (diff) | |
Merge "Use the full dexpreopt boot classpath when preopting with other images."
| -rw-r--r-- | java/dexpreopt.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 6b93c10e3..9141f9ef9 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -98,6 +98,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo global := dexpreoptGlobalConfig(ctx) bootImage := defaultBootImageConfig(ctx) + defaultBootImage := bootImage if global.UseApexImage { bootImage = apexBootImageConfig(ctx) } @@ -165,8 +166,11 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo Archs: archs, DexPreoptImages: images, - PreoptBootClassPathDexFiles: bootImage.dexPaths.Paths(), - PreoptBootClassPathDexLocations: bootImage.dexLocations, + // We use the dex paths and dex locations of the default boot image, as it + // 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, |