From 7a1cf9a52d526ed265ce0a3c2ea380fb65e58bcc Mon Sep 17 00:00:00 2001 From: Matt Gilbride Date: Tue, 3 Dec 2024 22:44:52 +0000 Subject: [PATCH] Update trusty to use secretkeeper hal V1 The HAL has been updated to V2, but the trusty prebuilt implementation does not yet have that code. Update trusty secretkeeper build to use V1 specifically instead of latest until the prebuilt has those changes. Bug: 372223451 Test: TH Change-Id: Ic2e9b578b50685d71b5597d8d34ac7ee36b6ddc9 --- trusty/secretkeeper/Android.bp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/trusty/secretkeeper/Android.bp b/trusty/secretkeeper/Android.bp index 6523edaf6..d399bf86d 100644 --- a/trusty/secretkeeper/Android.bp +++ b/trusty/secretkeeper/Android.bp @@ -27,18 +27,16 @@ rust_binary { "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, }