From b6d1843bac7453227e99e6085ab1301890167754 Mon Sep 17 00:00:00 2001 From: Raghuram Subramani Date: Fri, 18 Oct 2024 19:20:33 +0530 Subject: msm8996-common: Add required VNDK libraries & patch blobs Change-Id: Id19caeef43dbfd8cd1a39290a4addac43cf8ec5f --- extract-files.sh | 10 ++++++++++ msm8996.mk | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/extract-files.sh b/extract-files.sh index f7be1e9..346f08c 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -82,6 +82,7 @@ function blob_fixup() { sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "${2}" "${PATCHELF}" --remove-needed libandroid.so "${2}" "${PATCHELF}" --remove-needed libgui.so "${2}" + "${PATCHELF}" --remove-needed libfui.so "${2}" ;; # Patch blobs for VNDK @@ -134,6 +135,14 @@ function blob_fixup() { sed -i "s/name=\"android.hidl.manager-V1.0-java/name=\"android.hidl.manager@1.0-java/g" "${2}" ;; + vendor/lib64/libqmi_csi.so|vendor/lib/libqmi_csi.so) + "${PATCHELF}" --remove-needed libsmemlog.so "${2}" + ;; + + vendor/lib64/libwvhidl.so|vendor/lib64/libsettings.so) + "${PATCHELF}" --replace-needed "libprotobuf-cpp-full-v28.so" "libprotobuf-cpp-full.so" "${2}" + ;; + # Rename vulkan.msm8953 vendor/lib/hw/vulkan.msm8996.so | vendor/lib64/hw/vulkan.msm8996.so) "${PATCHELF}" --set-soname "vulkan.msm8996.so" "${2}" @@ -141,6 +150,7 @@ function blob_fixup() { esac grep "libhidlbase.so" "${1}" && "${PATCHELF}" --replace-needed "libhidlbase.so" "libhidlbase-v32.so" "${1}" + } if [ -z "${ONLY_TARGET}" ]; then diff --git a/msm8996.mk b/msm8996.mk index 4d37524..64f05f4 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -440,6 +440,14 @@ PRODUCT_COPY_FILES += \ prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libhidlbase-v32.so \ prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libhidlbase-v32.so \ prebuilts/vndk/v32/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhidlbase-v32.so \ + prebuilts/vndk/v32/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhidlbase-v32.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcutils-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcutils-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v29.so \ + prebuilts/vndk/v33/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v33.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libutils-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libutils-v29.so PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf -- cgit v1.2.3