From 8d88b76ae19ff5522d06273b96f36a593a7a0f3c Mon Sep 17 00:00:00 2001
From: Tomasz Swierczek <t.swierczek@samsung.com>
Date: Fri, 6 Oct 2017 16:03:35 +0200
Subject: [PATCH] Revert "log: Enable dlog logging on Tizen platform"

Tizen 5.0 build was broken due to duplicated DLOG-like macros.

This reverts commit 28c5b25f3aa2a692a5252ca52cd30e6625d6f769.

Change-Id: I5df8ebdb4c090b45af94fc813b567fe406fce2e4
---
 CMakeLists.txt                    |  9 ++-------
 TEEStub/PropertyAccess/Property.h |  1 -
 log/log.h                         | 14 ++------------
 packaging/tef-simulator.spec      |  3 +--
 simulatordaemon/CMakeLists.txt    |  1 -
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6daff2..4afbe25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,21 +41,16 @@ ADD_DEFINITIONS("-DBOOST_ASIO_DISABLE_STD_ARRAY")
 
 ADD_DEFINITIONS("-D_GNU_SOURCE")
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-
 # Set compiler warning flags
 # TODO uncomment these when it's cleanup time
 ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
 #ADD_DEFINITIONS("-Wall")                        # Generate all warnings
 #ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warnings
 
-# Enable tizen-specific preprocessor defines
-IF(DEFINED TIZEN)
-    ADD_DEFINITIONS("-D__TIZEN__")
-    ADD_DEFINITIONS("-D_CYNARA_INTEGRATION")
-ENDIF(DEFINED TIZEN)
+ADD_DEFINITIONS("-D_CYNARA_INTEGRATION")
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+    ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
     ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
     ADD_DEFINITIONS("-ggdb -O0")
     # undefine _FORTIFY_SOURCE - it makes no sense without optimization and produces warnings
diff --git a/TEEStub/PropertyAccess/Property.h b/TEEStub/PropertyAccess/Property.h
index f7413ea..36b8552 100644
--- a/TEEStub/PropertyAccess/Property.h
+++ b/TEEStub/PropertyAccess/Property.h
@@ -28,7 +28,6 @@
  *  Include files
  *-----------------------------------------------------------------------------*/
 #include <string>
-#include <cstdint>
 using namespace std;
 
 /*-----------------------------------------------------------------------------
diff --git a/log/log.h b/log/log.h
index c6d6068..84695f1 100644
--- a/log/log.h
+++ b/log/log.h
@@ -43,8 +43,8 @@ typedef int timer_t;
 #endif
 
 #ifdef __TIZEN__
-#include <dlog/dlog.h>
-#define TA_SDK_TAG "TA_SDK"
+#include <dlog.h>
+#define TA_SDK_TAG	"TA_SDK"
 #endif
 
 #ifdef _ANDROID_NDK
@@ -84,16 +84,6 @@ typedef enum {
 
 #define _LOG(module_level,debug_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,debug_level,##__VA_ARGS__)
 
-// if we use dlog, we need to replace its macros with our own
-#ifdef __TIZEN__
-#undef LOGE
-#undef LOGV
-#undef LOGD
-#undef LOGI
-#undef LOGS
-#undef LOGP
-#endif
-
 #define LOGE(module_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,ERROR_LEVEL_LOG,##__VA_ARGS__)
 #define LOGV(module_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,VERBOSE_LEVEL_LOG,##__VA_ARGS__)
 #define LOGD(module_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,DEBUG_LEVEL_LOG,##__VA_ARGS__)
diff --git a/packaging/tef-simulator.spec b/packaging/tef-simulator.spec
index f7fb586..521bcbf 100644
--- a/packaging/tef-simulator.spec
+++ b/packaging/tef-simulator.spec
@@ -82,8 +82,7 @@ cmake . \
         -DPKGCFG_LIB_DIR=%{lib_dir} \
         -DPKGCFG_PREFIX=/usr \
         -DPKGCFG_VERSION=%{version} \
-        -DSMACK_DOMAIN_NAME=%{smack_domain_name} \
-        -DTIZEN=1
+        -DSMACK_DOMAIN_NAME=%{smack_domain_name}
 make %{?jobs:-j%jobs}
 
 %install
diff --git a/simulatordaemon/CMakeLists.txt b/simulatordaemon/CMakeLists.txt
index 54aa690..ad60059 100644
--- a/simulatordaemon/CMakeLists.txt
+++ b/simulatordaemon/CMakeLists.txt
@@ -24,7 +24,6 @@ PKG_CHECK_MODULES(DAEMON_DEPS REQUIRED
                   security-manager
                   libsystemd-daemon
                   libtzplatform-config
-                  dlog
                   )
 
 # We require tef-libteec only for tee_client_api.h header
-- 
2.7.4