Keystore 2.0: Switch to autogenerated AIDL bindings.
Remove pregenerated file android_security_keystore2.rs and
reconfigure the build to use the generated target
android.security.keystore2-rust instead.
Test: keystore2_test
Change-Id: Iad24cab05ef35ccc766f7342225d4b79e8051ada
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index b5728a3..f4b153c 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -18,8 +18,8 @@
srcs: ["src/lib.rs"],
rustlibs: [
+ "android.system.keystore2-rust",
"libandroid_hardware_keymint",
- "libandroid_security_keystore2",
"libanyhow",
"libbinder_rs",
"libkeystore2_selinux",
@@ -39,9 +39,9 @@
test_suites: ["general-tests"],
auto_gen_config: true,
rustlibs: [
+ "android.system.keystore2-rust",
"libandroid_logger",
"libandroid_hardware_keymint",
- "libandroid_security_keystore2",
"libanyhow",
"libbinder_rs",
"libkeystore2_selinux",
@@ -66,18 +66,3 @@
"liblazy_static",
],
}
-
-// This is a placeholder for the libraries that will be generated from the AIDL specs
-// eventually.
-rust_library {
- name: "libandroid_security_keystore2",
- crate_name: "android_security_keystore2",
-
- srcs: ["src/android_security_keystore2.rs"],
-
- rustlibs: [
- "libandroid_hardware_keymint",
- "libbinder_rs",
- "liblazy_static",
- ],
-}