From 6c1f35e861f04fe7bc43149c1a3affaf1baa76d8 Mon Sep 17 00:00:00 2001 From: Debayan Kar Date: Mon, 18 Oct 2021 18:34:31 +0530 Subject: [PATCH] breeze: Patchelf libmtkcam_stdutils.so to load VNDK 30 version of libutils.so * Fixes :- - F linker : CANNOT LINK EXECUTABLE "/vendor/bin/hw/camerahalserver": cannot locate symbol "_ZN7android11PropertyMapD1Ev" referenced by "/vendor/lib64/libmtkcam_stdutils.so"... Change-Id: I7ed72b5761eab151070e503d52478ef80060b61a Signed-off-by: Debayan Kar Signed-off-by: Hadenix --- device.mk | 3 +++ extract-files.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device.mk b/device.mk index 6328263..bf3c4ef 100644 --- a/device.mk +++ b/device.mk @@ -232,6 +232,9 @@ PRODUCT_COPY_FILES += \ prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-sp/libc++.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc++-v28.so \ 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-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v30.so + # WiFi PRODUCT_PACKAGES += \ android.hardware.wifi@1.2.vendor \ diff --git a/extract-files.sh b/extract-files.sh index d19cca2..406ad5c 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -84,6 +84,9 @@ function blob_fixup() { vendor/lib64/hw/keystore.itrusty.so) "${PATCHELF}" --replace-needed "libkeymaster_messages.so" "libkeymaster_messages-v28.so" "${2}" ;; + vendor/lib64/libmtkcam_stdutils.so) + "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}" + ;; vendor/lib64/libmtk-ril.so) sed -i 's|AT+EAIC=2|AT+EAIC=3|g' "${2}" ;;