From 0f853db94cc175c5f9ffdfa576072b62fc49de23 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Tue, 24 Aug 2021 11:36:31 +0800
Subject: [PATCH] modularize aocd

Bug: 197585437
Test: boot with aoc started
Change-Id: I61560751a5d81816b7ecdc2e1be0eaae025a29e3
---
 {conf => aoc/conf}/init.aoc.daemon.rc   |  0
 {conf => aoc/conf}/init.aoc.nodaemon.rc |  0
 aoc/device.mk                           | 20 ++++++++++++++++++++
 conf/init.gs201.rc                      |  1 -
 device.mk                               | 21 +--------------------
 5 files changed, 21 insertions(+), 21 deletions(-)
 rename {conf => aoc/conf}/init.aoc.daemon.rc (100%)
 rename {conf => aoc/conf}/init.aoc.nodaemon.rc (100%)
 create mode 100644 aoc/device.mk

diff --git a/conf/init.aoc.daemon.rc b/aoc/conf/init.aoc.daemon.rc
similarity index 100%
rename from conf/init.aoc.daemon.rc
rename to aoc/conf/init.aoc.daemon.rc
diff --git a/conf/init.aoc.nodaemon.rc b/aoc/conf/init.aoc.nodaemon.rc
similarity index 100%
rename from conf/init.aoc.nodaemon.rc
rename to aoc/conf/init.aoc.nodaemon.rc
diff --git a/aoc/device.mk b/aoc/device.mk
new file mode 100644
index 00000000..c3feadbf
--- /dev/null
+++ b/aoc/device.mk
@@ -0,0 +1,20 @@
+PRODUCT_PACKAGES += \
+	aocd
+
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/aoc
+
+# 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/gs201/aoc/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
+else
+PRODUCT_COPY_FILES += \
+	device/google/gs201/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
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index c74b2bb2..39324602 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -1,7 +1,6 @@
 import /vendor/etc/init/hw/init.gs201.usb.rc
 import android.hardware.drm@1.2-service.widevine.rc
 import init.exynos.sensorhub.rc
-import /vendor/etc/init/hw/init.aoc.rc
 
 service vendor.charger /system/bin/charger
     class charger
diff --git a/device.mk b/device.mk
index 8b72a3e3..4333769e 100644
--- a/device.mk
+++ b/device.mk
@@ -239,15 +239,6 @@ PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
 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/gs201/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
-else
-PRODUCT_COPY_FILES += \
-	device/google/gs201/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
-endif
-
 # Recovery files
 PRODUCT_COPY_FILES += \
 	device/google/gs201/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs201.rc
@@ -394,17 +385,7 @@ PRODUCT_PACKAGES += \
 	android.hardware.dumpstate@1.1-service.gs201
 
 # AoC support
-PRODUCT_PACKAGES += \
-	aocd \
-	aocutil \
-	aoc_audio_cfg \
-	vp_util
-
-# AoC debug support
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-	aocdump
-endif
+include device/google/gs201/aoc/device.mk
 
 #
 # Audio HALs