diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index da68660..5faec08 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -106,8 +106,18 @@
 
 	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 @@
 		DexPreoptImagesDeps:     imagesDeps,
 		DexPreoptImageLocations: bootImage.imageLocations,
 
-		PreoptBootClassPathDexFiles:     bootImage.dexPathsDeps.Paths(),
-		PreoptBootClassPathDexLocations: bootImage.dexLocationsDeps,
+		PreoptBootClassPathDexFiles:     dexFiles,
+		PreoptBootClassPathDexLocations: dexLocations,
 
 		PreoptExtractedApk: false,