From 21be573430cd750cd5e76edf525058971f346f64 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 26 Jan 2025 13:15:37 +0000 Subject: [PATCH] sm8550-common: Build more audio blobs from sources Change-Id: I6c05826778c05ef14f7e4fbdbf40a1cd73e68bf5 --- BoardConfigCommon.mk | 2 ++ common.mk | 10 ++++++++-- extract-files.py | 5 +++++ proprietary-files.txt | 32 +++++++++++--------------------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index a774837..3ca3ad3 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -33,6 +33,8 @@ BOARD_SUPPORTS_OPENSOURCE_STHAL := true BOARD_SUPPORTS_SOUND_TRIGGER := true BOARD_USES_ALSA_AUDIO := true TARGET_PROVIDES_AUDIO_HAL := true +TARGET_PROVIDES_LIBAGM := true +TARGET_PROVIDES_LIBAR_PAL := true TARGET_USES_QCOM_MM_AUDIO := true # Boot diff --git a/common.mk b/common.mk index ac8bce7..3678094 100644 --- a/common.mk +++ b/common.mk @@ -34,15 +34,16 @@ PRODUCT_PACKAGES += \ libagm_compress_plugin \ libagm_mixer_plugin \ libagm_pcm_plugin \ + libats \ libbatterylistener \ libfmpal \ libhfp_pal \ libqcompostprocbundle \ libqcomvisualizer \ libqcomvoiceprocessing \ - libsndcardparser \ libvolumelistener \ - sound_trigger.primary.kalama + sound_trigger.primary.kalama \ + vendor.qti.hardware.AGMIPC@1.0-impl AUDIO_HAL_DIR := hardware/qcom-caf/sm8550/audio/primary-hal @@ -64,6 +65,11 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml # Bluetooth +PRODUCT_PACKAGES += \ + lib_bt_aptx \ + lib_bt_ble \ + lib_bt_bundle + PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml diff --git a/extract-files.py b/extract-files.py index a88d69a..01195b9 100755 --- a/extract-files.py +++ b/extract-files.py @@ -41,8 +41,13 @@ lib_fixups: lib_fixups_user_type = { 'vendor.qti.hardware.fm@1.0', ): lib_fixup_vendor_suffix, ( + 'libar-acdb', + 'libar-gsl', + 'liblx-osal', + 'libats', 'libagmclient', 'libpalclient', + 'vendor.qti.hardware.AGMIPC@1.0-impl', ): lib_fixup_remove, } diff --git a/proprietary-files.txt b/proprietary-files.txt index e7c9e48..99b9547 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,6 +1,8 @@ # All unpinned blobs are extracted from S9160ZHS6DYF1 # Current blobs with ELF checks disabled: +# audio.primary.kalama.so depends on liblx-osal and vendor.qti.hardware.AGMIPC@1.0-impl, which are gnu makefile targets +# libagm depends on libar-gsl, libats and liblx-osal, which are gnu makefile targets # libar-pal depends on libagmclient, which is a gnu makefile target # libqc2audio_hwaudiocodec depends on libpalclient, which is a gnu makefile target @@ -89,7 +91,7 @@ vendor/etc/models/acd/event.eai vendor/etc/models/acd/music.eai vendor/etc/models/acd/speech.eai vendor/etc/vintf/manifest/secaudiohalaidl_manifest.xml -vendor/lib64/hw/audio.primary.kalama.so +vendor/lib64/hw/audio.primary.kalama.so;DISABLE_CHECKELF vendor/lib64/hw/libsecaudiohal_aidl.so vendor/lib64/libAlacSwDec.so vendor/lib64/libApeSwDec.so @@ -98,20 +100,10 @@ vendor/lib64/libFlacSwDec.so vendor/lib64/libPeripheralStateUtils.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/libagm.so;DISABLE_CHECKELF vendor/lib64/libar-pal.so;DISABLE_CHECKELF -vendor/lib64/libats.so vendor/lib64/libaudio_log_utils.so -vendor/lib64/libcapiv2svacnnvendor.so -vendor/lib64/libcapiv2svarnnvendor.so -vendor/lib64/libcapiv2udk7vendor.so -vendor/lib64/libcapiv2uvvendor.so vendor/lib64/libdsd2pcm.so -vendor/lib64/liblistensoundmodel2vendor.so -vendor/lib64/liblx-ar_util.so -vendor/lib64/liblx-osal.so vendor/lib64/libprofileparamstorage.so vendor/lib64/libqtigefar.so vendor/lib64/librecordalive.so @@ -120,16 +112,10 @@ vendor/lib64/libsecaudioinfo.so vendor/lib64/libsecaudiolevel.so vendor/lib64/libspatializerparamstorage.so vendor/lib64/libspeakercalibration.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 vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so vendor/lib64/vendor.samsung.hardware.audio@1.0.so -# Audio AGM -vendor/lib64/libagm.so -vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so - # Audio FX modules vendor/lib64/lib_SamsungRec_08020.so vendor/lib64/lib_SoundAlive_3DPosition_ver202.so @@ -169,9 +155,6 @@ vendor/etc/vintf/manifest/bttpi-saidl.xml vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so vendor/lib64/hw/android.hardware.bluetooth@1.1-impl-qti.so vendor/lib64/hw/vendor.qti.hardware.bttpi-impl.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/vendor.qti.hardware.bttpi-V2-ndk.so @@ -901,6 +884,13 @@ vendor/lib64/libskeymint10device.so vendor/lib64/libskeymint_cli.so vendor/lib64/vendor.samsung.hardware.keymint-V2-ndk.so +# Listen +vendor/lib64/libcapiv2svacnnvendor.so +vendor/lib64/libcapiv2svarnnvendor.so +vendor/lib64/libcapiv2udk7vendor.so +vendor/lib64/libcapiv2uvvendor.so +vendor/lib64/liblistensoundmodel2vendor.so + # Media system_ext/lib64/libmmosal.so system_ext/lib64/libmmparser_lite.so