diff --git a/device.mk b/device.mk
index 56475ac..34cb0be 100644
--- a/device.mk
+++ b/device.mk
@@ -115,7 +115,10 @@ PRODUCT_PACKAGES += \
     android.hardware.ir@1.0-service
 
 # Dex
+PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
 PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := verify
+PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true
+USE_DEX2OAT_DEBUG := false
 
 # Display
 PRODUCT_PACKAGES += \