| commit | 22e75cd42a3aa231df7b527e69327f3e4560db2d | [log] [tgz] |
|---|---|---|
| author | Andrew Walbran <qwandor@google.com> | Wed Jan 17 11:13:53 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 17 11:13:53 2024 +0000 |
| tree | 100a83826832b3ec42959d4bde42966fbeabc650 | |
| parent | e6d32f96acac31a9e33fe7174d2511bc2107dd2b [diff] | |
| parent | 787be21ae853e5bec545d867158deda2863077c9 [diff] |
Merge "Import macros via rdroidtest for consistency." into main am: 787be21ae8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2910957 Change-Id: Id1042481f069dd8f1d6c53191fe0fb5dc9263d6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs b/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs index 26fdb56..df916d5 100644 --- a/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs +++ b/security/secretkeeper/aidl/vts/secretkeeper_test_client.rs
@@ -19,7 +19,7 @@ use crate::dice_sample::make_explicit_owned_dice; -use rdroidtest_macro::{ignore_if, rdroidtest}; +use rdroidtest::{ignore_if, rdroidtest}; use android_hardware_security_secretkeeper::aidl::android::hardware::security::secretkeeper::ISecretkeeper::ISecretkeeper; use android_hardware_security_secretkeeper::aidl::android::hardware::security::secretkeeper::SecretId::SecretId; use authgraph_vts_test as ag_vts;