move aoc settings to gs-common
Bug: 248426917
Test: boot with aoc launched
Change-Id: I7f3e65f9b27510bff657ca46c9688932a0352437
diff --git a/aoc/aoc.mk b/aoc/aoc.mk
index 2bbc8d3..2eadb08 100644
--- a/aoc/aoc.mk
+++ b/aoc/aoc.mk
@@ -1,3 +1,26 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/aoc/sepolicy
-PRODUCT_PACKAGES += dump_aoc
+PRODUCT_PACKAGES += dump_aoc \
+ aocd
+
+ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+# IAudioMetricExt HIDL
+PRODUCT_PACKAGES += \
+ vendor.google.audiometricext@1.0-service-vendor
+endif
+
+# If AoC Daemon is not present on this build, load firmware at boot via rc
+ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),)
+PRODUCT_COPY_FILES += \
+ device/google/gs-common/aoc/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
+else
+PRODUCT_COPY_FILES += \
+ device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
+endif
+
+# AoC debug support
+PRODUCT_PACKAGES_DEBUG += \
+ aocdump \
+ aocutil \
+ aoc_audio_cfg \
+ vp_util