diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b52516e..72d8de1 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -41,6 +41,7 @@ WITH_LINEAGE_CHARGER := false
 # Dexpreopt
 ifeq ($(HOST_OS),linux)
   ifneq ($(TARGET_BUILD_VARIANT),eng)
+    WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
     WITH_DEXPREOPT := true
   endif
 endif