From f706b02e51fb4d327c89254e8aecfedcc3752248 Mon Sep 17 00:00:00 2001
From: Craig Dooley <dooleyc@google.com>
Date: Wed, 26 May 2021 05:32:12 +0000
Subject: [PATCH] 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
---
 device.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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
 #