commit caf853008c09eb9adaf00366be5cdad38277dc37
author Karuna Wadhera <kwadhera@google.com> Wed Jan 22 22:28:44 2025 +0000
committer Karuna Wadhera <kwadhera@google.com> Wed Jan 22 19:23:16 2025 -0800
tree ecd2ed34ff0d43f06cbb5575805cd0b670ef51b7
parent cf2c32dabb67a9c8ad3d2ec6e5775e8d19310336

Always use V4 FEATURE_HARDWARE_KEYSTORE XML file

This is possible because the interfaces have been frozen.

Bug: 380020528
Bug: 369375199
Test: Treehugger
Change-Id: I3b64710b29a2c0d4462fd735d412587e26a31aeb

trusty/keymaster/Android.bp

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 8ebfc1a..f2c284a 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -120,10 +120,9 @@
         "libtrusty",
         "libutils",
     ],
-    required: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {
-        true: ["android.hardware.hardware_keystore.xml"],
-        default: ["android.hardware.hardware_keystore_V3.xml"],
-    }),
+    required: [
+        "android.hardware.hardware_keystore.xml",
+    ],
 }
 
 prebuilt_etc {

trusty/keymint/Android.bp

diff --git a/trusty/keymint/Android.bp b/trusty/keymint/Android.bp
index 36efb1b..caaaac2 100644
--- a/trusty/keymint/Android.bp
+++ b/trusty/keymint/Android.bp
@@ -42,10 +42,7 @@
     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: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {
-        true: ["android.hardware.hardware_keystore.xml"],
-        default: ["android.hardware.hardware_keystore_V3.xml"],
-    }),
+    required: ["android.hardware.hardware_keystore.xml"],
 }
 
 rust_binary {