From e8ff8b494a342ae758ec03bcd27b784d4a4168a2 Mon Sep 17 00:00:00 2001
From: Karuna Wadhera <kwadhera@google.com>
Date: Sun, 10 Nov 2024 23:42:57 +0000
Subject: [PATCH 1/2] Set the proper FEATURE_HARDWARE_KEYSTORE version

The binary implements V3 of the KeyMint HAL, so the feature version
should match.

Bug: 369375199
Bug: 378384123
Test: treehugger
Change-Id: Ib26ac73cf6593d9a50f7a019129c6e5e237ae2cd
---
 trusty/keymaster/Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index cb078299e..5a1e4202d 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -121,7 +121,7 @@ cc_binary {
         "libutils",
     ],
     required: [
-        "android.hardware.hardware_keystore.xml",
+        "android.hardware.hardware_keystore_V3.xml",
     ],
 }
 

From 5969d69248c8216bde0c905fa2a4ea0987c5ae8a Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Mon, 11 Nov 2024 17:52:45 +0000
Subject: [PATCH 2/2] Declare previous version when using frozen HALs

The KeyMint HAL has been updated to v4, but frozen builds (e.g. 25Q1)
remain on the previous version.  The core AIDL version is handled
automatically, but we also have a package manager flag whose value
is (100 * HAL-version).  Use `RELEASE_AIDL_USE_UNFROZEN` to switch
between `required` configs for that.

Test: TreeHugger
Bug: 377808462
Bug: 378026324
Change-Id: Id042bee2a81e8563e1029ea7bb43452715e3edee
---
 trusty/keymint/Android.bp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/trusty/keymint/Android.bp b/trusty/keymint/Android.bp
index 5cdd381e1..36efb1b89 100644
--- a/trusty/keymint/Android.bp
+++ b/trusty/keymint/Android.bp
@@ -42,9 +42,10 @@ rust_binary {
     defaults: ["android.hardware.security.keymint-service.rust.trusty.default"],
     init_rc: ["android.hardware.security.keymint-service.rust.trusty.rc"],
     vintf_fragments: ["android.hardware.security.keymint-service.rust.trusty.xml"],
-    required: [
-        "android.hardware.hardware_keystore.xml",
-    ],
+    required: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {
+        true: ["android.hardware.hardware_keystore.xml"],
+        default: ["android.hardware.hardware_keystore_V3.xml"],
+    }),
 }
 
 rust_binary {