Move AoC debug utilities to PRODUCT_PACKAGES_DEBUG
Bug: 185722771
Bug: 185725440
Bug: 185723000
Signed-off-by: Craig Dooley <dooleyc@google.com>
Change-Id: I726d173aaa64b279761f645c7822ded93e89d806
diff --git a/device.mk b/device.mk
index 83fca0d..93b6d02 100644
--- a/device.mk
+++ b/device.mk
@@ -396,17 +396,15 @@
# 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
#