commit 55af8875402c9181370a0c29072c6a4a085bc3d2
author Matt Gilbride <mattgilbride@google.com> Wed Mar 19 11:33:14 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 19 11:33:14 2025 -0700
tree cc38bac1c96be68b795b4f4cb0e7c945fc077c6c
parent a12ce4a170f0e71b18eaa7409891663753ddeb44
parent 5a964ac084130dad0578a0b33c2c4acf65f77f0e

Merge "Revert "Update trusty to use secretkeeper hal V1"" into main am: 5a964ac084

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3547266

Change-Id: If7b7196c1e1f67126d2a8f8d06c22934cbf3ee23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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