commit 5a964ac084130dad0578a0b33c2c4acf65f77f0e
author Matt Gilbride <mattgilbride@google.com> Wed Mar 19 11:09:32 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 19 11:09:32 2025 -0700
tree cc38bac1c96be68b795b4f4cb0e7c945fc077c6c
parent 30b0fbe957f8667a6b0d0e3f54009ddc839b7789
parent 84efbc566cf602e3a78be7cdf3da118c62f8203a

Merge "Revert "Update trusty to use secretkeeper hal V1"" into main

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,
 }