Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 448b6248 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Android (Google) Code Review
Browse files

Merge "libkeymaster1 was split into libkeymaster and _portable"

parents 2499a69d 85e15db3

keymaster/3.0/default/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libsoftkeymasterdevice \

    libcrypto \

    libkeymaster1 \

    libkeymaster_portable \

    libkeymaster \

    libhidlbase \

    libhidltransport \

    libutils \

keymaster/3.0/default/KeymasterDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;