commit 0d60df64c001116ddfe0ec3f6600e2429b5a3f54
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 04 22:13:43 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 04 22:13:43 2024 +0000
tree f4cb3344aa932b558a60a804897547f872fb2a89
parent 1cfbb8a4e7161444b1d93eadc6998d5aa2376ca5
parent 131fb178762029097c12dcb508256953a8141bf3

Merge "Update trusty to use secretkeeper hal V1" into main am: 43772f2bc2 am: 131fb17876

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

Change-Id: I0745b3ab3026bf10e3d657815502ef8be7bd889e
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,
 }