Add build configuration for common profile

Change-Id: Ia48db6617d10804ed39b4deec56ed33bb61d3a72
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f8c9d3..ca156e2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,10 @@ IF(TIZEN_ARCH_64)
        ADD_DEFINITIONS(-DTIZEN_ARCH_64)
 ENDIF(TIZEN_ARCH_64)
 
+IF(TIZEN_COMMON)
+       ADD_DEFINITIONS(-DTIZEN_COMMON)
+ENDIF(TIZEN_COMMON)
+
 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 503afe1..58d60fd 100755 (executable)
--- 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.154
+Version:       1.2.155
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -73,6 +73,15 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
+%if "%{profile}" == "common"
+        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
+        -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
+        -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
+        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
+        -DCTRL_IFACE_DBUS=1 \
+        -DTIZEN_DEBUG_DBUS_VALUE=1 \
+        -DTIZEN_COMMON=1 \
+%else
 %if "%{profile}" == "wearable"
         -DTIZEN_FEATURE_SERVICE_DISCOVERY=0 \
         -DTIZEN_FEATURE_WIFI_DISPLAY=0 \
@@ -102,6 +111,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %endif
 %endif
 %endif
+%endif
 %if "%{?_lib}" == "lib64"
        -DTIZEN_ARCH_64=1 \
 %endif

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
index a7006ab..6bcec4b 100755 (executable)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -42,7 +42,7 @@
 
 #define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
 
-#if defined TIZEN_MOBILE
+#if defined (TIZEN_MOBILE) || defined (TIZEN_COMMON)
 #define COMMON_IFACE_NAME "wlan0"
 
 #      if defined TIZEN_WLAN_BOARD_SPRD

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index 366e57f..f8d043c 100755 (executable)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -4638,13 +4638,15 @@ int _convert_bonjour_to_args(char *query, char *rdata, GVariantBuilder *builder)
                temp = NULL;
        }
 
+       g_variant_builder_add (builder, "{sv}", "service_type", g_variant_new_string("bonjour"));
+
        /* compress query */
        length = __ws_compress_query(compressed, query, qtype);
 
        args = g_variant_builder_new (G_VARIANT_TYPE ("ay"));
        for (i = 0; i < length; i++)
                g_variant_builder_add(args, "y", compressed[i]);
-       g_variant_builder_add (builder, "{sv}", "query", g_variant_new ("ay", args));
+       g_variant_builder_add(builder, "{sv}", "query", g_variant_new ("ay", args));
        g_variant_builder_unref (args);
 
        memset(compressed, 0x0, 256);
@@ -4657,7 +4659,7 @@ int _convert_bonjour_to_args(char *query, char *rdata, GVariantBuilder *builder)
                args = g_variant_builder_new (G_VARIANT_TYPE ("ay"));
                for (i = 0; i < length; i++)
                        g_variant_builder_add(args, "y", compressed[i]);
-               g_variant_builder_add (builder, "{sv}", "response", g_variant_new ("ay", args));
+               g_variant_builder_add(builder, "{sv}", "response", g_variant_new ("ay", args));
                g_variant_builder_unref (args);
        }