diff --git a/device.mk b/device.mk
index 83fca0d3..93b6d02c 100644
--- a/device.mk
+++ b/device.mk
@@ -396,17 +396,15 @@ PRODUCT_PACKAGES += \
 
 # AoC support
 PRODUCT_PACKAGES += \
-	aocd \
+	aocd
+
+# AoC debug support
+PRODUCT_PACKAGES_DEBUG += \
+	aocdump \
 	aocutil \
 	aoc_audio_cfg \
 	vp_util
 
-# AoC debug support
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-	aocdump
-endif
-
 #
 # Audio HALs
 #