From 45c75452de4ece66c79a3e9ba0f8fefabe6897c7 Mon Sep 17 00:00:00 2001 From: Lostark13 Date: Wed, 6 Nov 2024 18:15:04 +0530 Subject: [PATCH] sky: Switch to source built agm and pal --- device.mk | 12 +++++++++++- proprietary-files.txt | 25 +++---------------------- setup-makefiles.sh | 7 ++++++- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/device.mk b/device.mk index 2cb9a6b..592d8d7 100644 --- a/device.mk +++ b/device.mk @@ -69,7 +69,9 @@ PRODUCT_PACKAGES += \ android.hardware.audio@7.0-impl:64 \ android.hardware.audio.effect@7.0-impl:64 \ android.hardware.audio.service \ - android.hardware.soundtrigger@2.3-impl:64 + android.hardware.soundtrigger@2.3-impl:64 \ + vendor.qti.hardware.AGMIPC@1.0-service \ + vendor.qti.hardware.pal@1.0-impl:64 PRODUCT_PACKAGES += \ audio.bluetooth.default:64 \ @@ -81,6 +83,14 @@ PRODUCT_PACKAGES += \ audioadsprpcd PRODUCT_PACKAGES += \ + libagm_compress_plugin:64 \ + libagm_mixer_plugin:64 \ + libagm_pcm_plugin:64 \ + libagmclient:64 \ + libagmmixer:64 \ + libbatterylistener:64 \ + libfmpal:64 \ + libpalclient:64 \ libqcompostprocbundle:64 \ libqcomvisualizer:64 \ libqcomvoiceprocessing:64 \ diff --git a/proprietary-files.txt b/proprietary-files.txt index d561ced..7095949 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -58,49 +58,30 @@ vendor/lib/rfsa/adsp/misound_res_spk.bin # ANT+ vendor/lib64/hw/com.dsi.ant@1.0-impl.so -# Audio graph manager -vendor/bin/agmcap -vendor/bin/agmcompressplay -vendor/bin/agmplay -vendor/bin/cplay -vendor/bin/hw/vendor.qti.hardware.AGMIPC@1.0-service -vendor/etc/init/vendor.qti.hardware.AGMIPC@1.0-service.rc --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 -vendor/lib64/vendor.qti.hardware.AGMIPC@1.0.so - # Audio libraries vendor/etc/models/acd/event.eai vendor/etc/models/acd/music.eai vendor/etc/models/acd/speech.eai vendor/lib64/hw/audio.primary.parrot.so vendor/lib64/libadm.so +vendor/lib64/libagm.so vendor/lib64/libar-acdb.so vendor/lib64/libar-gpr.so vendor/lib64/libar-gsl.so --vendor/lib64/libar-pal.so +vendor/lib64/libar-pal.so vendor/lib64/libats.so vendor/lib64/libaudio_log_utils.so vendor/lib64/libaudiocloudctrl.so -vendor/lib64/libbatterylistener.so vendor/lib64/libcapiv2svacnnvendor.so vendor/lib64/libcapiv2svarnnvendor.so vendor/lib64/libcapiv2uvvendor.so -vendor/lib64/libfmpal.so vendor/lib64/libkaraokepal.so vendor/lib64/liblx-ar_util.so vendor/lib64/liblx-osal.so vendor/lib64/libmcs.so vendor/lib64/libpal_net_if.so -vendor/lib64/libpalclient.so vendor/lib64/libqtigefar.so -vendor/lib64/vendor.qti.hardware.pal@1.0-impl.so -vendor/lib64/vendor.qti.hardware.pal@1.0.so +vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so # Audio soundfx vendor/lib64/soundfx/libasphere.so diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 6473fa5..b1495c8 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -55,10 +55,15 @@ function lib_to_package_fixup_vendor_variants() { com.qualcomm.qti.dpm.api@1.0) echo "$1-vendor" ;; + libagm | \ + libagmclient | \ + libagmmixer | \ + libar-pal | \ libpalclient | \ libsndcardparser | \ libwpa_client | \ - libwfdaac_vendor) + libwfdaac_vendor | \ + vendor.qti.hardware.pal@1.0-impl) ;; *) return 1