commit 84efbc566cf602e3a78be7cdf3da118c62f8203a
author Matt Gilbride <mattgilbride@google.com> Mon Mar 17 12:06:35 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 17 12:06:35 2025 -0700
tree ba820b2cc5682fde3bcef37c6dbb7c70c2566e20
parent 7a1cf9a52d526ed265ce0a3c2ea380fb65e58bcc

Revert "Update trusty to use secretkeeper hal V1"

This reverts commit 7a1cf9a52d526ed265ce0a3c2ea380fb65e58bcc.

Reason for revert: Trusty prebuilt ready to use hal V2

Change-Id: Ia0a27a88ba0b1a5fbc75c1c1de060105b9a790e0

trusty/secretkeeper/Android.bp

diff --git a/trusty/secretkeeper/Android.bp b/trusty/secretkeeper/Android.bp
index d399bf8..6523eda 100644
--- a/trusty/secretkeeper/Android.bp
+++ b/trusty/secretkeeper/Android.bp
@@ -27,16 +27,18 @@
         "src/hal_main.rs",
     ],
     rustlibs: [
-        "android.hardware.security.secretkeeper-V1-rust",
         "libandroid_logger",
         "libauthgraph_hal",
         "libauthgraph_wire",
         "libbinder_rs",
         "liblibc",
         "liblog_rust",
-        "libsecretkeeper_hal_v1",
+        "libsecretkeeper_hal",
         "libtrusty-rs",
     ],
+    defaults: [
+        "secretkeeper_use_latest_hal_aidl_rust",
+    ],
     prefer_rlib: true,
 }