Use latest Keystore2 AIDL API
Test: m
Change-Id: I19510de8dcf384fc30bb8d2b1bf9116de5bd7eb1
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 43419b7..0e5afd9 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -27,6 +27,7 @@
srcs: ["src/lib.rs"],
defaults: [
"keymint_use_latest_hal_aidl_rust",
+ "keystore2_use_latest_aidl_rust",
],
rustlibs: [
@@ -39,7 +40,6 @@
"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 @@
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 @@
"librand",
"libserde",
"libserde_cbor",
- "libthiserror",
- "libanyhow",
+ "libthiserror",
+ "libanyhow",
],
}
@@ -110,13 +112,15 @@
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 @@
"librand",
"libserde",
"libserde_cbor",
- "libthiserror",
- "libanyhow",
+ "libthiserror",
+ "libanyhow",
],
}