From 8c3dc1c4da879d53c045ae5e8101f6d703089b80 Mon Sep 17 00:00:00 2001 From: SamarV-121 Date: Tue, 13 Dec 2022 12:54:07 +0530 Subject: [PATCH] breeze: Link older libutils for Audio, dfps and PQ * Abort message: 'incStrongRequireStrong() called on 0xb400007c5afa7250 which isn't already owned' --- device.mk | 1 + extract-files.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/device.mk b/device.mk index eef5002..f5971dd 100644 --- a/device.mk +++ b/device.mk @@ -234,6 +234,7 @@ PRODUCT_COPY_FILES += \ prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhwbinder.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhwbinder-v28.so PRODUCT_COPY_FILES += \ + prebuilts/vndk/v30/arm64/arch-arm-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libutils-v30.so \ prebuilts/vndk/v30/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v30.so # WiFi diff --git a/extract-files.sh b/extract-files.sh index 406ad5c..1c073ec 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -55,6 +55,12 @@ fi function blob_fixup() { case "${1}" in + vendor/bin/hw/android.hardware.audio@4.0-service-mediatek) + "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}" + ;; + vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service) + "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}" + ;; vendor/bin/hw/android.hardware.wifi@1.0-service-mediatek) "${PATCHELF}" --add-needed "libcompiler_rt.so" "${2}" "${PATCHELF}" --replace-needed "libwifi-hal.so" "libwifi-hal-mtk.so" "${2}" @@ -90,6 +96,12 @@ function blob_fixup() { vendor/lib64/libmtk-ril.so) sed -i 's|AT+EAIC=2|AT+EAIC=3|g' "${2}" ;; + vendor/lib/hw/vendor.mediatek.hardware.pq@2.2-impl.so) + "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}" + ;; + vendor/lib64/hw/dfps.mt6763.so) + "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}" + ;; esac }