Skip to content

Commit

Permalink
Keystore 2.0: Remove Keystore 1.0 and remaining references
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Janis Danisevskis committed Mar 22, 2021
1 parent 3c8ea06 commit 2437fde
Show file tree
Hide file tree
Showing 68 changed files with 812 additions and 12,077 deletions.
16 changes: 4 additions & 12 deletions keystore-engine/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ cc_library_shared {

srcs: [
"android_engine.cpp",
"keystore_backend_binder.cpp",
"keystore2_engine.cpp",
],

Expand All @@ -38,47 +37,40 @@ cc_library_shared {

shared_libs: [
"android.system.keystore2-V1-ndk_platform",
"libbinder",
"libbinder_ndk",
"libcrypto",
"libcutils",
"libhidlbase",
"libkeystore_aidl",
"libkeystore_binder",
"libkeystore_parcelables",
"liblog",
"libbase",
"libutils",
],

}

// 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",
],

cflags: [
"-fvisibility=hidden",
"-Wall",
"-Werror",
"-DBACKEND_WIFI_HIDL",
],

shared_libs: [
"android.system.keystore2-V1-ndk_platform",
"[email protected]",
"libbase",
"libbinder_ndk",
"libcrypto",
"liblog",
"libhidlbase",
"libcutils",
"libutils",
],
Expand Down
Loading

0 comments on commit 2437fde

Please sign in to comment.