Merge "Disable dexpreopt on targets that do not include default ART config."
am: 940ef19f77
Change-Id: I4981e09708b328b3d6f5fbc61907dea39c4dcba6
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 3d7f36c..74ef667 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -123,6 +123,10 @@
}
func skipDexpreoptBootJars(ctx android.PathContext) bool {
+ if dexpreoptGlobalConfig(ctx).DisablePreopt {
+ return true
+ }
+
if ctx.Config().UnbundledBuild() {
return true
}