[wfd-manager]: Add support of 64 Bit based Platform 97/43897/2
authorManeesh Jain <maneesh.jain@samsung.com>
Wed, 15 Jul 2015 06:35:22 +0000 (12:05 +0530)
committerManeesh Jain <maneesh.jain@samsung.com>
Wed, 15 Jul 2015 06:44:41 +0000 (12:14 +0530)
This patch is required to load the plugin library
for 64 bit based Target platform,

Change-Id: I7cda8779d0b5ea8085b93b5a2f32f50ef61328b8
Signed-off-by: Maneesh Jain <maneesh.jain@samsung.com>
oem/wifi-direct-oem.h
packaging/wifi-direct-manager.spec
src/wifi-direct-manager.c

index ca004c9..bdf316d 100755 (executable)
@@ -29,6 +29,8 @@
 #define __WIFI_DIRECT_OEM_H__
 
 #define SUPPL_PLUGIN_PATH "/usr/lib/wifi-direct-plugin-wpasupplicant.so"
+#define SUPPL_PLUGIN_64BIT_PATH "/usr/lib64/wifi-direct-plugin-wpasupplicant.so"
+
 
 #define OEM_MACSTR_LEN 18
 #define OEM_MACADDR_LEN 6
index 4cbd944..6aa05b3 100755 (executable)
@@ -1,6 +1,6 @@
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.85
+Version:       1.2.86
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
index f383b72..c338b40 100755 (executable)
@@ -1432,7 +1432,12 @@ static void *wfd_plugin_init(wfd_manager_s *manager)
        WDS_LOGD("Node name [%s], HW ID [%s]", kernel_info.nodename, kernel_info.machine);
 
        errno = 0;
-       handle = dlopen(SUPPL_PLUGIN_PATH, RTLD_NOW);
+
+       if(strncmp(kernel_info.machine, "aarch64", 7) == 0)
+               handle = dlopen(SUPPL_PLUGIN_64BIT_PATH, RTLD_NOW);
+       else
+               handle = dlopen(SUPPL_PLUGIN_PATH, RTLD_NOW);
+
        if (!handle) {
                WDS_LOGE("Failed to open shared object. [%s]", dlerror());
                __WDS_LOG_FUNC_EXIT__;