From 3e50aa45bd3d68f26e51d93055bef6f02ab18eb1 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Thu, 20 Oct 2022 11:23:42 +0800
Subject: [PATCH] move aoc settings to gs-common

Bug: 248426917
Test: boot with aoc launched
Change-Id: Ib55442380043646aa736959cd353cc82edccbf7b
---
 aoc/conf/init.aoc.daemon.rc   |  1 -
 aoc/conf/init.aoc.nodaemon.rc |  3 ---
 aoc/device.mk                 | 26 --------------------------
 device.mk                     |  4 ----
 4 files changed, 34 deletions(-)
 delete mode 100644 aoc/conf/init.aoc.daemon.rc
 delete mode 100644 aoc/conf/init.aoc.nodaemon.rc
 delete mode 100644 aoc/device.mk

diff --git a/aoc/conf/init.aoc.daemon.rc b/aoc/conf/init.aoc.daemon.rc
deleted file mode 100644
index 1cf204e1..00000000
--- a/aoc/conf/init.aoc.daemon.rc
+++ /dev/null
@@ -1 +0,0 @@
-# AoC firmware will be loaded by Daemon
\ No newline at end of file
diff --git a/aoc/conf/init.aoc.nodaemon.rc b/aoc/conf/init.aoc.nodaemon.rc
deleted file mode 100644
index 329d7d34..00000000
--- a/aoc/conf/init.aoc.nodaemon.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Load AoC firmware and boot
-on property:vendor.all.modules.ready=1
-    write /sys/devices/platform/19000000.aoc/firmware aoc.bin
\ No newline at end of file
diff --git a/aoc/device.mk b/aoc/device.mk
deleted file mode 100644
index 3c04b09f..00000000
--- a/aoc/device.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-PRODUCT_PACKAGES += \
-	aocd
-
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/aoc
-
-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/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/device.mk b/device.mk
index 9a45af59..301ce359 100644
--- a/device.mk
+++ b/device.mk
@@ -455,10 +455,6 @@ PRODUCT_PACKAGES += \
 # dumpstate HAL
 PRODUCT_PACKAGES += \
 	android.hardware.dumpstate-service.gs201
-
-# AoC support
-include device/google/gs201/aoc/device.mk
-
 #
 # Audio HALs
 #