From 8065130663492fb4c5ab9fce32b1f7a33122091e Mon Sep 17 00:00:00 2001 From: Hadenix Date: Fri, 8 Apr 2022 18:20:19 +0300 Subject: [PATCH] breeze: Patchelf keystore.itrusty.so to load VNDK 28 of libkeymaster_messages.so * E: Could not load /vendor/lib64/hw/keystore.itrusty.so from default namespace: dlopen failed: cannot locate symbol "_ZN9keymaster19GenerateKeyResponseD1Ev" referenced by "/vendor/lib64/hw/keystore.itrusty.so".... Signed-off-by: Hadenix --- device.mk | 3 ++- extract-files.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index ca39af4..3ca7b58 100644 --- a/device.mk +++ b/device.mk @@ -221,7 +221,8 @@ PRODUCT_COPY_FILES += \ prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmedia_helper-v28.so \ prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-core/libxml2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libxml2-v28.so \ prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-core/libui.so:$(TARGET_COPY_OUT_VENDOR)/lib/libui-v28.so \ - prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libgatekeeper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgatekeeper-v28.so + prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libgatekeeper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgatekeeper-v28.so \ + prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libkeymaster_messages.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymaster_messages-v28.so PRODUCT_COPY_FILES += \ prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-sp/libcompiler_rt.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcompiler_rt.so \ diff --git a/extract-files.sh b/extract-files.sh index 4a6f02d..d19cca2 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -81,6 +81,9 @@ function blob_fixup() { vendor/lib64/hw/gatekeeper.itrusty.so) "${PATCHELF}" --replace-needed "libgatekeeper.so" "libgatekeeper-v28.so" "${2}" ;; + vendor/lib64/hw/keystore.itrusty.so) + "${PATCHELF}" --replace-needed "libkeymaster_messages.so" "libkeymaster_messages-v28.so" "${2}" + ;; vendor/lib64/libmtk-ril.so) sed -i 's|AT+EAIC=2|AT+EAIC=3|g' "${2}" ;;