Delete KM1
Test: Build
Change-Id: Iee6ec98163dff3a969debd9f4343c7b06ebe8d4f
diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 053ad67..0c4e3c5 100644
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -12,7 +12,7 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
- libsoftkeymasterdevice \
+ libpuresoftkeymasterdevice \
libcrypto \
libkeymaster_portable \
libpuresoftkeymasterdevice \
diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 8b416c3..25f16b5 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -22,7 +22,6 @@
#include <log/log.h>
#include <AndroidKeymaster3Device.h>
-#include <hardware/keymaster1.h>
#include <hardware/keymaster2.h>
#include <hardware/keymaster_defs.h>
@@ -32,18 +31,6 @@
namespace V3_0 {
namespace implementation {
-static int get_keymaster1_dev(keymaster1_device_t** dev, const hw_module_t* mod) {
- int rc = keymaster1_open(mod, dev);
- if (rc) {
- ALOGE("Error %d opening keystore keymaster1 device", rc);
- if (*dev) {
- (*dev)->common.close(&(*dev)->common);
- *dev = nullptr;
- }
- }
- return rc;
-}
-
static int get_keymaster2_dev(keymaster2_device_t** dev, const hw_module_t* mod) {
int rc = keymaster2_open(mod, dev);
if (rc) {
@@ -63,14 +50,8 @@
return ::keymaster::ng::CreateKeymasterDevice();
}
- if (mod->module_api_version < KEYMASTER_MODULE_API_VERSION_1_0) {
+ if (mod->module_api_version < KEYMASTER_MODULE_API_VERSION_2_0) {
return nullptr;
- } else if (mod->module_api_version == KEYMASTER_MODULE_API_VERSION_1_0) {
- keymaster1_device_t* dev = nullptr;
- if (get_keymaster1_dev(&dev, mod)) {
- return nullptr;
- }
- return ::keymaster::ng::CreateKeymasterDevice(dev);
} else {
keymaster2_device_t* dev = nullptr;
if (get_keymaster2_dev(&dev, mod)) {
diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp
index e2ae803..6b75faa 100644
--- a/keymaster/3.0/vts/functional/Android.bp
+++ b/keymaster/3.0/vts/functional/Android.bp
@@ -36,7 +36,10 @@
static_libs: [
"android.hardware.keymaster@3.0",
"libcrypto_static",
- "libsoftkeymasterdevice",
+ "libpuresoftkeymasterdevice",
],
- test_suites: ["general-tests", "vts"],
+ test_suites: [
+ "general-tests",
+ "vts",
+ ],
}
diff --git a/keymaster/4.0/vts/performance/Android.bp b/keymaster/4.0/vts/performance/Android.bp
index d7342ad..93b27bc 100644
--- a/keymaster/4.0/vts/performance/Android.bp
+++ b/keymaster/4.0/vts/performance/Android.bp
@@ -32,7 +32,7 @@
static_libs: [
"android.hardware.keymaster@4.0",
"libkeymaster4support",
- "libsoftkeymasterdevice",
- "libchrome"
+ "libpuresoftkeymasterdevice",
+ "libchrome",
],
}