dopinder: Patch keymint service to replace ndk_platform backend

At the same time bump the ndk version where applicable to fix:

error: module "android.hardware.security.keymint-service.amlogic" variant
"android_vendor_arm_armv8-a": depends on multiple versions of the same aidl_interface:
android.hardware.security.keymint-V1-ndk-source,
android.hardware.security.keymint-V3-ndk-source

Change-Id: I394545d7af4422cae2c446278a681cbbc353c9f3

diff --git a/extract-files.sh b/extract-files.sh
index 73c4fbb246fba4b8bb81912896e05a7482681485..51183aa4fac28144e5c3c985d20d2dd06cd2b1d7 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -8,6 +8,12 @@
 
 function blob_fixup() {
     case "${1}" in
+        vendor/bin/hw/android.hardware.security.keymint-service.amlogic)
+            [ "$2" = "" ] && return 0
+            "${PATCHELF}" --replace-needed "android.hardware.security.keymint-V1-ndk_platform.so" "android.hardware.security.keymint-V3-ndk.so" "${2}"
+            "${PATCHELF}" --replace-needed "android.hardware.security.secureclock-V1-ndk_platform.so" "android.hardware.security.secureclock-V1-ndk.so" "${2}"
+            "${PATCHELF}" --replace-needed "android.hardware.security.sharedsecret-V1-ndk_platform.so" "android.hardware.security.sharedsecret-V1-ndk.so" "${2}"
+            ;;
         vendor/etc/init/tee-supplicant.rc)
             [ "$2" = "" ] && return 0
             sed -i 's#/vendor/lib/#/vendor/lib/modules/#g' "${2}"

diff --git a/proprietary-files.txt b/proprietary-files.txt
index cee663e32acea9ba7733c534be25bae3133337f6..6e0d9c4d0b95f192d67b707d0cbcb1ce0ba39c42 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -67,7 +67,7 @@ system/priv-app/AskeyAutoPair/AskeyAutoPair.apk
 system/priv-app/AskeySetupCustomizer/AskeySetupCustomizer.apk;OVERRIDES=DeadpoolService
 
 ## TEE - from adt3-user 13 TTT1.230205.001 9565391 release-keys
-vendor/bin/hw/android.hardware.security.keymint-service.amlogic|0fad4ea718c26abd0d1faad369de76edb3efdfa4
+vendor/bin/hw/android.hardware.security.keymint-service.amlogic|0fad4ea718c26abd0d1faad369de76edb3efdfa4|6d706e5530f9953978f51c38bbc2fb5feb4974cf
 vendor/bin/tee-supplicant|37274543a5c6b3f926b1a3658097369f6aae6b20
 vendor/bin/tee_preload_fw|cf7574e36cb1b2c341f5a9044a32460be0ff2891
 vendor/etc/init/android.hardware.security.keymint-service.amlogic.rc|c0d12ddad0ee0d0a20e3a3b272e8724c384b5de6