commit 014c710c2744affcb2dcbf1d3c0f9a5613127774
author David Drysdale <drysdale@google.com> Wed Nov 13 06:50:42 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 13 06:50:42 2024 +0000
tree b65124f56402315ffabd99e2541f36a1ede7e5da
parent 574ae66ee689e175a5420ce51267303eba027df4
parent 5969d69248c8216bde0c905fa2a4ea0987c5ae8a

Merge changes from topic "keymint-v3" into main

* changes:
  Declare previous version when using frozen HALs
  Set the proper FEATURE_HARDWARE_KEYSTORE version

trusty/keymaster/Android.bp

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

trusty/keymint/Android.bp

diff --git a/trusty/keymint/Android.bp b/trusty/keymint/Android.bp
index 5cdd381..36efb1b 100644
--- a/trusty/keymint/Android.bp
+++ b/trusty/keymint/Android.bp
@@ -42,9 +42,10 @@
     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 {