diff options
| author | Tri Vo <trong@google.com> | 2022-09-06 14:30:45 -0700 |
|---|---|---|
| committer | Tri Vo <trong@google.com> | 2022-09-06 17:27:28 -0700 |
| commit | 735f9cb643708bf11889bb229a14590cbc19fdc7 (patch) | |
| tree | c8be138d8ec5f8ed2aef191747cc683a3e879d85 /keystore2/Android.bp | |
| parent | a99ac4e96e53ab318a0bd6ea7e2afbf2223690ae (diff) | |
| download | security-735f9cb643708bf11889bb229a14590cbc19fdc7.tar.gz | |
Use latest Keystore2 AIDL API
Test: m
Change-Id: I19510de8dcf384fc30bb8d2b1bf9116de5bd7eb1
Diffstat (limited to 'keystore2/Android.bp')
| -rw-r--r-- | keystore2/Android.bp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/keystore2/Android.bp b/keystore2/Android.bp index 43419b7d..0e5afd91 100644 --- a/keystore2/Android.bp +++ b/keystore2/Android.bp @@ -27,6 +27,7 @@ rust_defaults { srcs: ["src/lib.rs"], defaults: [ "keymint_use_latest_hal_aidl_rust", + "keystore2_use_latest_aidl_rust", ], rustlibs: [ @@ -39,7 +40,6 @@ rust_defaults { "android.security.maintenance-rust", "android.security.metrics-rust", "android.security.remoteprovisioning-rust", - "android.system.keystore2-V2-rust", "libanyhow", "libbinder_rs", "libkeystore2_aaid-rust", @@ -79,9 +79,11 @@ rust_library { name: "libkeystore2_test_utils", crate_name: "keystore2_test_utils", srcs: ["test_utils/lib.rs"], - defaults: ["keymint_use_latest_hal_aidl_rust"], + defaults: [ + "keymint_use_latest_hal_aidl_rust", + "keystore2_use_latest_aidl_rust", + ], rustlibs: [ - "android.system.keystore2-V2-rust", "libbinder_rs", "libkeystore2_selinux", "liblog_rust", @@ -89,8 +91,8 @@ rust_library { "librand", "libserde", "libserde_cbor", - "libthiserror", - "libanyhow", + "libthiserror", + "libanyhow", ], } @@ -110,13 +112,15 @@ rust_library { rust_test { name: "keystore2_test_utils_test", srcs: ["test_utils/lib.rs"], - defaults: ["keymint_use_latest_hal_aidl_rust"], + defaults: [ + "keymint_use_latest_hal_aidl_rust", + "keystore2_use_latest_aidl_rust", + ], test_suites: ["general-tests"], require_root: true, auto_gen_config: true, compile_multilib: "first", rustlibs: [ - "android.system.keystore2-V2-rust", "libbinder_rs", "libkeystore2_selinux", "liblog_rust", @@ -124,8 +128,8 @@ rust_test { "librand", "libserde", "libserde_cbor", - "libthiserror", - "libanyhow", + "libthiserror", + "libanyhow", ], } |