diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index f0bb9a3..0ffedf6 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -180,8 +180,6 @@
 	return android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName())
 }
 
-// Returns whether dexpreopt is applicable to the module.
-// When it returns true, neither profile nor dexpreopt artifacts will be generated.
 func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool {
 	if !ctx.Device() {
 		return true
@@ -207,6 +205,14 @@
 
 	global := dexpreopt.GetGlobalConfig(ctx)
 
+	if global.DisablePreopt {
+		return true
+	}
+
+	if inList(moduleName(ctx), global.DisablePreoptModules) {
+		return true
+	}
+
 	isApexSystemServerJar := global.AllApexSystemServerJars(ctx).ContainsJar(moduleName(ctx))
 	if isApexVariant(ctx) {
 		// Don't preopt APEX variant module unless the module is an APEX system server jar.