From 3366f4a16a08433637353cf56f77b64fd74f9b4e Mon Sep 17 00:00:00 2001
From: Arian <arian.kulmer@web.de>
Date: Tue, 19 Mar 2024 23:13:00 +0100
Subject: [PATCH] sm8450-common: Add security.rkp-V3 dependency to keymint
 service

The symbol _ZN4aidl7android8hardware8security7keymint29IRemotelyProvisionedComponent10descriptorE
was moved from android.hardware.security.keymint-V2-ndk to android.hardware.security.rkp-V3-ndk.

Change-Id: I7f3c40e3e8a2a848cdcb73e5232952f63681aa58
---
 common.mk        | 1 +
 extract-files.sh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/common.mk b/common.mk
index 4c8ef68..d007bbf 100644
--- a/common.mk
+++ b/common.mk
@@ -268,6 +268,7 @@ PRODUCT_PACKAGES += \
     android.hardware.security.keymint-V1-ndk_platform.vendor \
     android.hardware.security.secureclock-V1-ndk_platform.vendor \
     android.hardware.security.sharedsecret-V1-ndk_platform.vendor \
+    android.hardware.security.rkp-V3-ndk.vendor \
     libkeymaster_messages.vendor
 
 PRODUCT_COPY_FILES += \
diff --git a/extract-files.sh b/extract-files.sh
index b420ba5..e1eec11 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -64,6 +64,9 @@ fi
 
 function blob_fixup() {
     case "${1}" in
+        vendor/bin/hw/android.hardware.security.keymint-service-qti|vendor/lib/libqtikeymint.so|vendor/lib64/libqtikeymint.so)
+            grep -q "android.hardware.security.rkp-V3-ndk.so" "${2}" || "${PATCHELF_0_17_2}" --add-needed "android.hardware.security.rkp-V3-ndk.so" "${2}"
+            ;;
         vendor/etc/init/hw/init.mi_thermald.rc|vendor/etc/init/hw/init.qcom.usb.rc|vendor/etc/init/hw/init.qti.kernel.rc)
             sed -i 's/on charger/on property:init.svc.vendor.charger=running/g' "${2}"
             ;;