From 5049a89a5d6e445abaf6a7bf162e27cd996ea93e Mon Sep 17 00:00:00 2001
From: SGCMarkus <markusornik@gmail.com>
Date: Thu, 19 Oct 2023 11:53:28 +0200
Subject: [PATCH] sm8550-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 e0a880c..1133019 100644
--- a/common.mk
+++ b/common.mk
@@ -226,6 +226,7 @@ PRODUCT_PACKAGES += \
     android.hardware.hardware_keystore.xml \
     android.hardware.security.keymint-V1-ndk.vendor \
     android.hardware.security.keymint-V2-ndk.vendor \
+    android.hardware.security.rkp-V3-ndk.vendor \
     android.hardware.security.secureclock-V1-ndk.vendor \
     android.hardware.security.sharedsecret-V1-ndk.vendor
 
diff --git a/extract-files.sh b/extract-files.sh
index 84a248a..9cb1e3a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -60,6 +60,9 @@ fi
 
 function blob_fixup() {
     case "${1}" in
+        vendor/bin/hw/android.hardware.security.keymint-service)
+            ${PATCHELF} --add-needed "android.hardware.security.rkp-V3-ndk.so" "${2}"
+            ;;
     esac
 }