From 741f6764930783a3efc701e488a7f3a7f1e2dc7a Mon Sep 17 00:00:00 2001
From: Stricted <info@stricted.net>
Date: Mon, 8 Oct 2018 19:44:29 +0200
Subject: [PATCH] samsung_slsi: exynos5: resolve compiling warnings/errors

Change-Id: Ie0f884e33f72977999c2dfc8d697c9357b891418
---
 libkeymaster/Android.mk             |  2 +-
 libkeymaster/keymaster_mobicore.cpp | 24 ++++++++++++------------
 libkeymaster/tlcTeeKeymaster_if.c   |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libkeymaster/Android.mk b/libkeymaster/Android.mk
index 32753a3..6f22471 100644
--- a/libkeymaster/Android.mk
+++ b/libkeymaster/Android.mk
@@ -26,7 +26,7 @@ LOCAL_C_INCLUDES := \
 	$(MOBICORE_PATH)/daemon/ClientLib/public \
 	$(MOBICORE_PATH)/common/MobiCore/inc/
 LOCAL_C_FLAGS = -fvisibility=hidden -Wall -Werror
-LOCAL_SHARED_LIBRARIES := libcrypto liblog libMcClient
+LOCAL_SHARED_LIBRARIES := libcrypto liblog libMcClient libnativehelper
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
diff --git a/libkeymaster/keymaster_mobicore.cpp b/libkeymaster/keymaster_mobicore.cpp
index 0ef92e5..b056d07 100644
--- a/libkeymaster/keymaster_mobicore.cpp
+++ b/libkeymaster/keymaster_mobicore.cpp
@@ -28,7 +28,7 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
-#include <UniquePtr.h>
+#include <nativehelper/UniquePtr.h>
 
 #define LOG_TAG "ExynosKeyMaster"
 #include <cutils/log.h>
@@ -484,20 +484,20 @@ static int exynos_km_open(const hw_module_t* module, const char* name,
 }
 
 static struct hw_module_methods_t keystore_module_methods = {
-    open: exynos_km_open,
+    .open = exynos_km_open,
 };
 
 struct keystore_module HAL_MODULE_INFO_SYM
 __attribute__ ((visibility ("default"))) = {
-    common: {
-        tag: HARDWARE_MODULE_TAG,
-        version_major: 1,
-        version_minor: 0,
-        id: KEYSTORE_HARDWARE_MODULE_ID,
-        name: "Keymaster Exynos HAL",
-        author: "Samsung S.LSI",
-        methods: &keystore_module_methods,
-        dso: 0,
-        reserved: {},
+    .common = {
+        .tag = HARDWARE_MODULE_TAG,
+        .version_major = 1,
+        .version_minor = 0,
+        .id = KEYSTORE_HARDWARE_MODULE_ID,
+        .name = "Keymaster Exynos HAL",
+        .author = "Samsung S.LSI",
+        .methods = &keystore_module_methods,
+        .dso = 0,
+        .reserved = {},
     },
 };
diff --git a/libkeymaster/tlcTeeKeymaster_if.c b/libkeymaster/tlcTeeKeymaster_if.c
index ded7d19..eb12ae8 100644
--- a/libkeymaster/tlcTeeKeymaster_if.c
+++ b/libkeymaster/tlcTeeKeymaster_if.c
@@ -99,7 +99,7 @@ static tciMessage_ptr TEE_Open(
 
     } while (false);
 
-    LOG_I("TEE_Open(): returning pointer to TCI buffer: 0x%.8x\n", pTci);
+    //LOG_I("TEE_Open(): returning pointer to TCI buffer: 0x%.8x\n", pTci);
 
     return pTci;
 }
-- 
2.20.1