From 484c9906aefa13ced449d591673ce6efc05ce633 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Mon, 3 Mar 2025 19:38:26 +0200
Subject: [PATCH] keymaster: replace with keymint aidl apex

* https://android.googlesource.com/device/linaro/dragonboard/+/2d24638a3d0cbbf3540825844e1256eee37129a1
* Fixes https://github.com/raspberry-vanilla/android_local_manifest/issues/29.
---
 device.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index eb990ab..6c7d462 100644
--- a/device.mk
+++ b/device.mk
@@ -208,9 +208,12 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/keylayout/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
 
-# Keymaster
+# Keymint
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@4.1-service
+    com.android.hardware.keymint.rust_nonsecure
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.keystore.app_attest_key.xml
 
 # Lights
 PRODUCT_PACKAGES += \