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
This commit is contained in:
Janis Danisevskis 2020-09-11 14:30:34 -07:00
parent 6214d7d3ad
commit 71dc30de9c
2 changed files with 2 additions and 1160 deletions

View file

@ -18,8 +18,8 @@ rust_library {
srcs: ["src/lib.rs"],
rustlibs: [
"android.system.keystore2-rust",
"libandroid_hardware_keymint",
"libandroid_security_keystore2",
"libanyhow",
"libbinder_rs",
"libkeystore2_selinux",
@ -39,9 +39,9 @@ rust_test {
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 @@ rust_library {
"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",
],
}

File diff suppressed because it is too large Load diff