Keystore 2.0: Remove Keystore 1.0 and remaining references
* Remove superseded keystore engine backends.
* Remove keystore_cli.
* Update keystoer_cli_v2 to use Keystore 2.0.
* Update confirmationui invocation test.
* Remove reference to enable keystore2 property from keystore2.rc.
Test: N/A
Bug: 171305684
Change-Id: I855dead9d95c2c8cfa451944087bc8290871c0e5
diff --git a/keystore-engine/Android.bp b/keystore-engine/Android.bp
index 9980765..0cecfd8 100644
--- a/keystore-engine/Android.bp
+++ b/keystore-engine/Android.bp
@@ -26,7 +26,6 @@
srcs: [
"android_engine.cpp",
- "keystore_backend_binder.cpp",
"keystore2_engine.cpp",
],
@@ -38,14 +37,9 @@
shared_libs: [
"android.system.keystore2-V1-ndk_platform",
- "libbinder",
"libbinder_ndk",
"libcrypto",
"libcutils",
- "libhidlbase",
- "libkeystore_aidl",
- "libkeystore_binder",
- "libkeystore_parcelables",
"liblog",
"libbase",
"libutils",
@@ -53,14 +47,15 @@
}
-// This builds a variant of libkeystore-engine that uses a HIDL HAL
-// owned by the WiFi user to perform signing operations.
+// This builds a variant of libkeystore-engine that is available vendor.
+// It used to use a HIDL interface to connect to keystore through wificond.
+// Now That Keystore 2.0 has a vintf stable interface this library is
+// actually identical to libkeystore-engine.
cc_library_shared {
name: "libkeystore-engine-wifi-hidl",
srcs: [
"android_engine.cpp",
- "keystore_backend_hidl.cpp",
"keystore2_engine.cpp",
],
@@ -68,17 +63,14 @@
"-fvisibility=hidden",
"-Wall",
"-Werror",
- "-DBACKEND_WIFI_HIDL",
],
shared_libs: [
"android.system.keystore2-V1-ndk_platform",
- "android.system.wifi.keystore@1.0",
"libbase",
"libbinder_ndk",
"libcrypto",
"liblog",
- "libhidlbase",
"libcutils",
"libutils",
],