diff --git a/config/common.mk b/config/common.mk
index 139f2e21..1fac22fe 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -119,6 +119,11 @@ ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)
 include vendor/lineage/config/lineage_sdk_common.mk
 endif
 
+ART_BUILD_TARGET_NDEBUG := false
+ART_BUILD_TARGET_DEBUG := false
+ART_BUILD_HOST_NDEBUG := false
+ART_BUILD_HOST_DEBUG := false
+
 # Do not include art debug targets
 PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
 
@@ -132,6 +137,9 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true
 SYSTEM_OPTIMIZE_JAVA ?= true
 SYSTEMUI_OPTIMIZE_JAVA ?= true
 
+# Disable dex2oat debug
+USE_DEX2OAT_DEBUG := false
+
 # Disable vendor restrictions
 PRODUCT_RESTRICT_VENDOR_FILES := false