From 503142bbbd307bce955285fae154fb4f9e1aba1d Mon Sep 17 00:00:00 2001 From: SamarV-121 Date: Sat, 14 Nov 2020 18:53:23 +0530 Subject: [PATCH] universal7885: Copy prebuilt v29 libkeymaster_portable.so, libpuresoftkeymasterdevice.so * vndksupport: Could not load /vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so from default namespace: dlopen failed: cannot locate symbol "_ZNK9keymaster21EcdsaOperationFactory15CreateOperationEONS_3KeyERKNS_16AuthorizationSetEP17keymaster_error_t" referenced by "/vendor/lib64/libkeymaster3device.so" * vndksupport: Could not load /vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so from default namespace: dlopen failed: cannot locate symbol "_ZN9keymaster24PureSoftKeymasterContextC1Ev" referenced by "/vendor/lib64/libkeymaster3device.so" Signed-off-by: SamarV-121 --- extract-files.sh | 9 ++++++++- universal7904-common.mk | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/extract-files.sh b/extract-files.sh index 1baf3c0..c7575f1 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -64,4 +64,11 @@ if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then "${KANG}" --section "${SECTION}" fi -"${MY_DIR}/setup-makefiles.sh" \ No newline at end of file +BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE_COMMON}/proprietary" + +patchelf --replace-needed "libkeymaster_portable.so" "libkeymaster_portable-v29.so" "${BLOB_ROOT}/vendor/lib64/libkeymaster3device.so" +patchelf --replace-needed "libkeymaster_portable.so" "libkeymaster_portable-v29.so" "${BLOB_ROOT}/vendor/lib/libkeymaster3device.so" +patchelf --replace-needed "libpuresoftkeymasterdevice.so" "libpuresoftkeymasterdevice-v29.so" "${BLOB_ROOT}/vendor/lib64/libkeymaster3device.so" +patchelf --replace-needed "libpuresoftkeymasterdevice.so" "libpuresoftkeymasterdevice-v29.so" "${BLOB_ROOT}/vendor/lib/libkeymaster3device.so" + +"${MY_DIR}/setup-makefiles.sh" diff --git a/universal7904-common.mk b/universal7904-common.mk index 64ff993..c54f6ad 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -40,6 +40,13 @@ PRODUCT_PACKAGES += \ fstab.enableswap \ init.exynos7904.rc +# Keymaster +PRODUCT_COPY_FILES += \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libkeymaster_portable.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymaster_portable-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libkeymaster_portable.so:$(TARGET_COPY_OUT_VENDOR)/lib/libkeymaster_portable-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libpuresoftkeymasterdevice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpuresoftkeymasterdevice-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libpuresoftkeymasterdevice.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpuresoftkeymasterdevice-v29.so + # NFC PRODUCT_PACKAGES += \ libnfc-nci \