From dd154e2379886310dae9cfd759674caf752fde43 Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Sun, 27 Aug 2023 12:54:32 -0500
Subject: [PATCH] sm8550-common: Move most agm and pal targets to source built

Change-Id: I6ca0c5396a3b583b37e029f5c98ff13127db65a6
---
 common.mk             |  9 ++++++++-
 proprietary-files.txt | 16 ----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/common.mk b/common.mk
index 2df3760..1bc3e8e 100644
--- a/common.mk
+++ b/common.mk
@@ -45,11 +45,17 @@ PRODUCT_PACKAGES += \
     android.hardware.audio.service \
     android.hardware.bluetooth.audio-impl \
     android.hardware.soundtrigger@2.3-impl \
+    agmcap \
+    agmcompressplay \
+    agmplay \
     audio.bluetooth.default \
     audio.primary.kalama \
     audio.r_submix.default \
     audio.usb.default \
     audioadsprpcd \
+    libagm_compress_plugin \
+    libagm_mixer_plugin \
+    libagm_pcm_plugin \
     libbatterylistener \
     libqcompostprocbundle \
     libqcomvisualizer \
@@ -245,7 +251,8 @@ PRODUCT_PACKAGES += \
     libavservices_minijail \
     libavservices_minijail.vendor \
     libcodec2_hidl@1.0.vendor \
-    libcodec2_vndk.vendor
+    libcodec2_vndk.vendor \
+    libpalclient
 
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3ce47de..021620c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -106,7 +106,6 @@ vendor/lib/libhfp_pal.so
 vendor/lib/liblistensoundmodel2vendor.so
 vendor/lib/liblx-ar_util.so
 -vendor/lib/liblx-osal.so
-vendor/lib/libpalclient.so
 vendor/lib/libprofileparamstorage.so
 vendor/lib/libqtigefar.so
 vendor/lib/librecordalive.so
@@ -139,8 +138,6 @@ vendor/lib64/libhfp_pal.so
 vendor/lib64/liblistensoundmodel2vendor.so
 vendor/lib64/liblx-ar_util.so
 -vendor/lib64/liblx-osal.so
-vendor/lib64/libpal_net_if.so
-vendor/lib64/libpalclient.so
 vendor/lib64/libqtigefar.so
 vendor/lib64/libsecaudiocoreutils.so
 vendor/lib64/libsecaudioinfo.so
@@ -150,22 +147,9 @@ vendor/lib64/vendor.qti.hardware.ListenSoundModel@1.0.so
 -vendor/lib64/vendor.qti.hardware.pal@1.0-impl.so
 
 # Audio AGM
-vendor/bin/agmcap
-vendor/bin/agmcompressplay
-vendor/bin/agmplay
 -vendor/lib/libagm.so
-vendor/lib/libagm_compress_plugin.so
-vendor/lib/libagm_mixer_plugin.so
-vendor/lib/libagm_pcm_plugin.so
-vendor/lib/libagmclient.so
-vendor/lib/libagmmixer.so
 -vendor/lib/vendor.qti.hardware.AGMIPC@1.0-impl.so
 -vendor/lib64/libagm.so
-vendor/lib64/libagm_compress_plugin.so
-vendor/lib64/libagm_mixer_plugin.so
-vendor/lib64/libagm_pcm_plugin.so
-vendor/lib64/libagmclient.so
-vendor/lib64/libagmmixer.so
 -vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so
 
 # Audio configs