diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/dexpreopt.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index da6866031..5faec0817 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -106,8 +106,18 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo global := dexpreoptGlobalConfig(ctx) bootImage := defaultBootImageConfig(ctx) + dexFiles := bootImage.dexPathsDeps.Paths() + dexLocations := bootImage.dexLocationsDeps + if global.UseArtImage { + bootImage = artBootImageConfig(ctx) + } if global.UseApexImage { bootImage = frameworkJZBootImageConfig(ctx) + dexFiles = bootImage.dexPathsDeps.Paths() + dexLocations = bootImage.dexLocationsDeps + if global.UseArtImage { + bootImage = artJZBootImageConfig(ctx) + } } var archs []android.ArchType @@ -178,8 +188,8 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo DexPreoptImagesDeps: imagesDeps, DexPreoptImageLocations: bootImage.imageLocations, - PreoptBootClassPathDexFiles: bootImage.dexPathsDeps.Paths(), - PreoptBootClassPathDexLocations: bootImage.dexLocationsDeps, + PreoptBootClassPathDexFiles: dexFiles, + PreoptBootClassPathDexLocations: dexLocations, PreoptExtractedApk: false, |