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

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

diff --git a/conf/init.aoc.daemon.rc b/conf/init.aoc.daemon.rc
deleted file mode 100644
index 1cf204e1..00000000
--- a/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/conf/init.aoc.nodaemon.rc b/conf/init.aoc.nodaemon.rc
deleted file mode 100644
index 329d7d34..00000000
--- a/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/device.mk b/device.mk
index 820784d7..968f0c52 100644
--- a/device.mk
+++ b/device.mk
@@ -276,15 +276,6 @@ PRODUCT_COPY_FILES += \
 	device/google/gs101/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/gs101/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
-else
-PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
-endif
-
 # Recovery files
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc
@@ -454,17 +445,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	android.hardware.dumpstate-service.gs101
 
-# AoC support
-PRODUCT_PACKAGES += \
-	aocd
-
-# AoC debug support
-PRODUCT_PACKAGES_DEBUG += \
-	aocdump \
-	aocutil \
-	aoc_audio_cfg \
-	vp_util
-
 #
 # Audio HALs
 #
@@ -1075,12 +1055,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # PRODUCT_PROPERTY_OVERRIDES += \
 #	ro.audio.spatializer_enabled=true
 
-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-# IAudioMetricExt HIDL
-PRODUCT_PACKAGES += \
-    vendor.google.audiometricext@1.0-service-vendor
-endif
-
 # vndservicemanager and vndservice no longer included in API 30+, however needed by vendor code.
 # See b/148807371 for reference
 PRODUCT_PACKAGES += vndservicemanager