Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

libkeymaster1 split to libkeymaster and _portable

Browse Source 
libkeyamster1 was split into libkeymaster and
libkeymaster_portable.
Also removed UniquePtr usage from keymaster hal.

Bug: 37467707
Test: keymaster vts test and keystore cts test
Merged-In: Ic660586d3d9cfd20022a9c694f276da89e796e5d
(cherry picked from commit 85e15db319)

Change-Id: I8652f28ac3da1999a774be5e1110c7d2efac5339
This commit is contained in:
Janis Danisevskis
2017-04-26 15:05:37 -07:00
committed by Jae Shin
parent 240f9e1476
commit ab887a4433
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keymaster/3.0/default/Android.mk
View File

@@ -11,7 +11,8 @@ LOCAL_SHARED_LIBRARIES := \
liblog \
libsoftkeymasterdevice \
libcrypto \
libkeymaster1 \
libkeymaster_portable \
libkeymaster \
libhidlbase \
libhidltransport \
libutils \

4
keymaster/3.0/default/KeymasterDevice.cpp
View File

@@ -64,7 +64,7 @@ static int keymaster0_device_initialize(const hw_module_t* mod, keymaster2_devic
assert(mod->module_api_version < KEYMASTER_MODULE_API_VERSION_1_0);
ALOGI("Found keymaster0 module %s, version %x", mod->name, mod->module_api_version);
UniquePtr<SoftKeymasterDevice> soft_keymaster(new SoftKeymasterDevice);
std::unique_ptr<SoftKeymasterDevice> soft_keymaster(new SoftKeymasterDevice);
keymaster0_device_t* km0_device = NULL;
keymaster_error_t error = KM_ERROR_OK;
@@ -107,7 +107,7 @@ static int keymaster1_device_initialize(const hw_module_t* mod, keymaster2_devic
assert(mod->module_api_version >= KEYMASTER_MODULE_API_VERSION_1_0);
ALOGI("Found keymaster1 module %s, version %x", mod->name, mod->module_api_version);
UniquePtr<SoftKeymasterDevice> soft_keymaster(new SoftKeymasterDevice);
std::unique_ptr<SoftKeymasterDevice> soft_keymaster(new SoftKeymasterDevice);
keymaster1_device_t* km1_device = nullptr;
keymaster_error_t error = KM_ERROR_OK;