sabrina: 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 e2186e69868ef698dd14becd721a1f2eb5242540..07ae10f3520a7e9f98e449312e7edc44cda7a80f 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}"
+            ;;
         # Use generic Light HAL context for led_control_service
         vendor/etc/init/led_control_service.rc)
             [ "$2" = "" ] && return 0