From 286657f8c671bd8e627e1873c57f1d8ca7be2995 Mon Sep 17 00:00:00 2001
From: hiroshi <hiroshi@tanuki.page>
Date: Mon, 30 Jun 2025 13:51:26 -0400
Subject: [PATCH] Revert "[DNM]Pong: Switch to pre-build audio"

This reverts commit 3077c9fb55be6d663444a6e3d4222e40c236670c.
---
 BoardConfig.mk                       |  6 ++----
 audio/resourcemanager_waipio_qrd.xml |  1 +
 device.mk                            |  8 ++++++--
 extract-files.py                     |  3 +++
 proprietary-files.txt                | 19 ++-----------------
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ed894f5..1d0453f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,8 +40,8 @@ AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 AUDIO_FEATURE_ENABLED_SSR := true
 AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
+BOARD_SUPPORTS_OPENSOURCE_STHAL := true
 BOARD_USES_ALSA_AUDIO := true
-TARGET_PROVIDES_AUDIO_HAL := true
 TARGET_USES_QCOM_MM_AUDIO := true
 
 # Bootloader
@@ -73,9 +73,7 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
 DEVICE_FRAMEWORK_MANIFEST_FILE += $(DEVICE_PATH)/framework_manifest.xml
 DEVICE_MATRIX_FILE += hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE += \
-    $(DEVICE_PATH)/manifest.xml \
-    hardware/qcom-caf/sm8450/audio/primary-hal/configs/common/manifest_non_qmaa.xml \
-    hardware/qcom-caf/sm8450/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml
+    $(DEVICE_PATH)/manifest.xml 
 
 # Kernel
 BOARD_BOOTCONFIG := \
diff --git a/audio/resourcemanager_waipio_qrd.xml b/audio/resourcemanager_waipio_qrd.xml
index 22bc397..0d49f8b 100644
--- a/audio/resourcemanager_waipio_qrd.xml
+++ b/audio/resourcemanager_waipio_qrd.xml
@@ -71,6 +71,7 @@
         <param key="lpi_logging_enable" value ="false" />
         <param key="upd_dedicated_be" value ="true" />
 	<param key="signal_handler" value ="true" />
+	<param key="record_use_ap_lvacfs" value="enable"/>
     </config_params>
     <config_volume>
         <use_volume_set_param>0</use_volume_set_param>
diff --git a/device.mk b/device.mk
index 2881255..0c33ccb 100644
--- a/device.mk
+++ b/device.mk
@@ -40,9 +40,13 @@ PRODUCT_PACKAGES += \
     android.hardware.bluetooth.audio-impl \
     android.hardware.soundtrigger@2.3-impl \
     audio.bluetooth.default \
+    audio.primary.taro \
     audio.r_submix.default \
     audio.usb.default \
     audioadsprpcd \
+    lib_bt_aptx \
+    lib_bt_ble \
+    lib_bt_bundle \
     libagm_compress_plugin \
     libagm_mixer_plugin \
     libagmmixer \
@@ -54,8 +58,8 @@ PRODUCT_PACKAGES += \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libvolumelistener \
-    vendor.qti.hardware.AGMIPC@1.0-service \
-    vendor.qti.hardware.pal@1.0-impl
+    sound_trigger.primary.taro \
+    vendor.qti.hardware.AGMIPC@1.0-service
 
 AUDIO_HAL_DIR := hardware/qcom-caf/sm8450/audio/primary-hal
 
diff --git a/extract-files.py b/extract-files.py
index 907493f..ff8f42f 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -43,6 +43,9 @@ lib_fixups: lib_fixups_user_type = {
     ): lib_fixup_vendor_suffix,
     (
         'libagmclient',
+        'libar-acdb',
+        'libats',
+        'liblx-osal',
         'libpalclient',
     ): lib_fixup_remove,
 }
diff --git a/proprietary-files.txt b/proprietary-files.txt
index cdadd8e..0e84647 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -123,14 +123,8 @@ vendor/lib64/hw/com.dsi.ant@1.0-impl.so
 vendor/etc/models/acd/event.eai
 vendor/etc/models/acd/music.eai
 vendor/etc/models/acd/speech.eai
-vendor/lib64/hw/audio.primary.taro.so
-vendor/lib64/hw/sound_trigger.primary.taro.so
 vendor/lib64/lib_lvacfs.so
 vendor/lib64/libadm.so
-vendor/lib64/libar-acdb.so
-vendor/lib64/libar-gpr.so
-vendor/lib64/libar-gsl.so
-vendor/lib64/libar-pal.so;DISABLE_CHECKELF
 vendor/lib64/libats.so
 vendor/lib64/libaudio_log_utils.so
 vendor/lib64/libcapiv2svacnnvendor.so
@@ -146,14 +140,8 @@ vendor/lib64/liblx-ar_util.so
 vendor/lib64/liblx-osal.so
 vendor/lib64/libmcs.so
 vendor/lib64/libpal_net_if.so
-vendor/lib64/libqtigefar.so
-vendor/lib64/vendor.qti.hardware.ListenSoundModel@1.0-impl.so
-vendor/lib64/vendor.qti.hardware.ListenSoundModel@1.0.so
-vendor/lib64/vendor.qti.hardware.pal@1.0-impl.so
-
-# Audio AGM
-vendor/lib64/libagm.so
-vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so
+vendor/lib64/libqtigefar.so;DISABLE_CHECKELF
+vendor/lib64/vendor.qti.hardware.pal@1.0-impl.so;DISABLE_CHECKELF
 
 # Audio FX modules
 vendor/lib64/soundfx/libasphere.so
@@ -210,9 +198,6 @@ vendor/etc/lvacfs_params/4mic/audiozoom_4.txt
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
 vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
-vendor/lib64/lib_bt_aptx.so
-vendor/lib64/lib_bt_ble.so
-vendor/lib64/lib_bt_bundle.so
 vendor/lib64/libbtnv.so
 vendor/lib64/libsoc_helper.so
 vendor/lib64/libsoc_helper_jni.so