diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 7c8364c..7c9f1b2 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -37,7 +37,7 @@
 endif
 
 LOCAL_CFLAGS += -DFEATURE_IPACM_HAL -Wall -Werror -Wno-error=macro-redefined
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 LOCAL_CFLAGS += -DDEBUG
 endif
 
diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk
index 24ec7cf..af786eb 100644
--- a/ipanat/src/Android.mk
+++ b/ipanat/src/Android.mk
@@ -20,7 +20,10 @@
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-LOCAL_CFLAGS := -DDEBUG -Wall -Werror
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+LOCAL_CFLAGS := -DDEBUG
+endif
+LOCAL_CFLAGS += -Wall -Werror
 LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID
 LOCAL_MODULE := libipanat
 LOCAL_MODULE_TAGS := optional