From 128d12fa581e59f8d36cad5d3e5bcd6ed22e3f3e Mon Sep 17 00:00:00 2001
From: Yu Jiung <jiung.yu@samsung.com>
Date: Tue, 18 Aug 2015 16:34:54 +0900
Subject: [PATCH] [wifi-direct-manager]Add compile flag for 64 Bit architecture

Change-Id: I21d5216b7bf93c36feca679552b4568ea274b981
---
 CMakeLists.txt                     | 4 ++++
 packaging/wifi-direct-manager.spec | 6 +++++-
 src/wifi-direct-manager.c          | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0ccc31..5666824 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,10 @@ IF(TIZEN_WLAN_CONCURRENT_ENABLE)
 	ADD_DEFINITIONS(-DTIZEN_WLAN_CONCURRENT_ENABLE)
 ENDIF(TIZEN_WLAN_CONCURRENT_ENABLE)
 
+IF(TIZEN_ARCH_64)
+	ADD_DEFINITIONS(-DTIZEN_ARCH_64)
+ENDIF(TIZEN_ARCH_64)
+
 IF(TIZEN_MOBILE)
 	ADD_DEFINITIONS(-DTIZEN_MOBILE)
 ENDIF(TIZEN_MOBILE)
diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 9c06705..9e38e31 100755
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:		wifi-direct-manager
 Summary:	Wi-Fi Direct manger
-Version:	1.2.89
+Version:	1.2.90
 Release:	1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -75,12 +75,16 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %else
 %if "%{profile}" == "tv"
 	-DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
+	-DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
 	-DTIZEN_FEATURE_WIFI_DISPLAY=1 \
 	-DCTRL_IFACE_DBUS=1 \
 	-DTIZEN_TV=1 \
 %endif
 %endif
 %endif
+%if "%{?_lib}" == "lib64"
+	-DTIZEN_ARCH_64=1 \
+%endif
 -DCMAKE_LIB_DIR=%{_libdir}
 
 make %{?_smp_mflags}
diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index b80d1f5..9de2231 100755
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -1432,11 +1432,11 @@ static void *wfd_plugin_init(wfd_manager_s *manager)
 
 	errno = 0;
 
-	if(strncmp(kernel_info.machine, "aarch64", 7) == 0)
+#if defined(TIZEN_ARCH_64)
 		handle = dlopen(SUPPL_PLUGIN_64BIT_PATH, RTLD_NOW);
-	else
+#else
 		handle = dlopen(SUPPL_PLUGIN_PATH, RTLD_NOW);
-
+#endif
 	if (!handle) {
 		WDS_LOGE("Failed to open shared object. [%s]", dlerror());
 		__WDS_LOG_FUNC_EXIT__;
-- 
2.7.4