commit a0691764ca87c2b78bf2114c312c5551e27502b0
author Priyanka Advani (xWF) <padvani@google.com> Wed Mar 19 15:48:00 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 19 15:48:00 2025 -0700
tree bec4f12275bed85e35e03cb92c5868b3ad09a8b1
parent a4c0d56626bb6a949952a262adf6a2b79790f960
parent 7e74ffd905e36032198a63dbdb7df498280dc339

Merge "Revert^2 "Update trusty to use secretkeeper hal V1"" into main am: 7e74ffd905

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

Change-Id: Ifd93c972c27f830defac8d1c90e46129c091aee8
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 6523eda..d399bf8 100644
--- a/trusty/secretkeeper/Android.bp
+++ b/trusty/secretkeeper/Android.bp
@@ -27,18 +27,16 @@
         "src/hal_main.rs",
     ],
     rustlibs: [
+        "android.hardware.security.secretkeeper-V1-rust",
         "libandroid_logger",
         "libauthgraph_hal",
         "libauthgraph_wire",
         "libbinder_rs",
         "liblibc",
         "liblog_rust",
-        "libsecretkeeper_hal",
+        "libsecretkeeper_hal_v1",
         "libtrusty-rs",
     ],
-    defaults: [
-        "secretkeeper_use_latest_hal_aidl_rust",
-    ],
     prefer_rlib: true,
 }