From 4a1a4fb0524f4a4de4bf25ebe86de29b2e7648d1 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 6 Oct 2024 10:32:13 +0100 Subject: [PATCH] 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 --- extract-files.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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 -- 2.20.1