diff --git a/android/config.go b/android/config.go
index cfa2c0f..24be10a 100644
--- a/android/config.go
+++ b/android/config.go
@@ -775,10 +775,6 @@
 	return c.productVariables.BootJars
 }
 
-func (c *config) PreoptBootJars() []string {
-	return c.productVariables.PreoptBootJars
-}
-
 func (c *config) DexpreoptGlobalConfig() string {
 	return String(c.productVariables.DexpreoptGlobalConfig)
 }
diff --git a/android/variable.go b/android/variable.go
index 700d917..5ee888f 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -200,8 +200,7 @@
 	UncompressPrivAppDex             *bool    `json:",omitempty"`
 	ModulesLoadedByPrivilegedModules []string `json:",omitempty"`
 
-	BootJars       []string `json:",omitempty"`
-	PreoptBootJars []string `json:",omitempty"`
+	BootJars []string `json:",omitempty"`
 
 	IntegerOverflowExcludePaths []string `json:",omitempty"`
 
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 6af839b..3d4042b 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -151,4 +151,6 @@
 func dexpreoptConfigMakevars(ctx android.MakeVarsContext) {
 	ctx.Strict("PRODUCT_BOOTCLASSPATH", strings.Join(defaultBootclasspath(ctx), ":"))
 	ctx.Strict("PRODUCT_SYSTEM_SERVER_CLASSPATH", strings.Join(systemServerClasspath(ctx), ":"))
+
+	ctx.Strict("DEXPREOPT_BOOT_JARS_MODULES", strings.Join(defaultBootImageConfig(ctx).modules, ":"))
 }