diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-04-08 17:19:15 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2019-04-08 22:47:39 +0100 |
| commit | cd6abd83eee0d45a0bc803aaf4b97a91fb0b074a (patch) | |
| tree | e361137e9a7fcde1b16a2b7df1fd0c531933c277 /java | |
| parent | bed7cd31018813d0042cc86ae3bcb85da97e9997 (diff) | |
| download | build_soong-cd6abd83eee0d45a0bc803aaf4b97a91fb0b074a.tar.gz build_soong-cd6abd83eee0d45a0bc803aaf4b97a91fb0b074a.tar.bz2 build_soong-cd6abd83eee0d45a0bc803aaf4b97a91fb0b074a.zip | |
Use the full dexpreopt boot classpath when preopting with other images.
Bug: 119800099
Test: m
(cherry picked from commit 06758a7e13d2fe26bc8e2798bba21dd85e4cd2de)
Change-Id: I60c154c3b3e2ab9b80ea9df0efa168ccd9efcc60
Merged-In: Ia9b34aa92ebb1b4de96ea0f8f290d798be19b2cf
Diffstat (limited to 'java')
| -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 6b93c10e..9141f9ef 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, |