From: Bruno Martins <bgcngm@gmail.com>
Date: Sun, 6 Oct 2024 09:32:13 +0000 (+0100)
Subject: sabrina: Patch keymint service to replace ndk_platform backend
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4a1a4fb0524f4a4de4bf25ebe86de29b2e7648d1;p=GitHub%2FLineageOS%2FG12%2Fandroid_device_google_sabrina.git

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 e2186e6..07ae10f 100755
--- 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