diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 0656ff4..05868da 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -113,7 +113,7 @@
 }
 
 func computeBootClasspath(ctx android.PathContext, info *bootJarsInfo) {
-	runtimeModules := android.RemoveListFromList(info.global.TargetCoreJars, info.global.ProductUpdatableBootModules)
+	runtimeModules := info.global.RuntimeApexJars
 	nonFrameworkModules := concat(runtimeModules, info.global.ProductUpdatableBootModules)
 	frameworkModules := android.RemoveListFromList(info.global.BootJars, nonFrameworkModules)