diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 6fdc5c3a2..13f23ad02 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -118,9 +118,17 @@ PRODUCT_COPY_FILES += \
     system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt
 
 # Different dexopt types for different package update/install times.
+# On eng builds, make "boot" reasons do pure JIT for faster turnaround.
+ifeq (eng,$(TARGET_BUILD_VARIANT))
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=verify-at-runtime \
+        pm.dexopt.boot=verify-at-runtime
+else
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=interpret-only \
+        pm.dexopt.boot=verify-profile
+endif
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    pm.dexopt.first-boot=interpret-only \
-    pm.dexopt.boot=verify-profile \
     pm.dexopt.install=interpret-only \
     pm.dexopt.bg-dexopt=speed-profile \
     pm.dexopt.ab-ota=speed-profile \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 76281f9f9..9c94574e5 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -108,9 +108,17 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.carrier=unknown
 
 # Different dexopt types for different package update/install times.
+# On eng builds, make "boot" reasons do pure JIT for faster turnaround.
+ifeq (eng,$(TARGET_BUILD_VARIANT))
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=verify-at-runtime \
+        pm.dexopt.boot=verify-at-runtime
+else
+    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        pm.dexopt.first-boot=interpret-only \
+        pm.dexopt.boot=verify-profile
+endif
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    pm.dexopt.first-boot=interpret-only \
-    pm.dexopt.boot=verify-profile \
     pm.dexopt.install=interpret-only \
     pm.dexopt.bg-dexopt=speed-profile \
     pm.dexopt.ab-ota=speed-profile \