Keystore 2.0: Use generated KeyMint AIDL bindingis.
This patch adjusts keystore2 to use rust bindings generated from the
KeyMint AIDL spec instead of using pregenerated bindings.
Bug: 160623310
Test: keystore2_test
Change-Id: I77bb0426991381535f9dbe4f32e7e137a8eb7df3
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 2c135f8..40d91c2 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -19,7 +19,7 @@
rustlibs: [
"android.system.keystore2-rust",
- "libandroid_hardware_keymint_keystore2",
+ "android.hardware.keymint-rust",
"libanyhow",
"libbinder_rs",
"libkeystore2_selinux",
@@ -40,8 +40,8 @@
auto_gen_config: true,
rustlibs: [
"android.system.keystore2-rust",
+ "android.hardware.keymint-rust",
"libandroid_logger",
- "libandroid_hardware_keymint_keystore2",
"libanyhow",
"libbinder_rs",
"libkeystore2_crypto_bindgen",
@@ -106,18 +106,3 @@
],
name: "keystore2_crypto_test",
}
-
-// This is a placeholder for the libraries that will be generated from the AIDL specs
-// eventually.
-rust_library {
- name: "libandroid_hardware_keymint_keystore2",
- crate_name: "android_hardware_keymint",
-
- srcs: ["src/android_hardware_keymint.rs"],
-
- rustlibs: [
- "libbinder_rs",
- "liblazy_static",
- ],
-}
-