Merge branch 'private-develop' into tizen

Signed-off-by: Sangho Park <sangho1206.park@samsung.com>
Conflicts:
	CMakeLists.txt
	emuld.service
	include/emuld.h
	include/mobile.h
	include/wearable.h
	packaging/emuld.spec
	src/common.cpp
	src/emuld.cpp
	src/mobile.cpp
	src/net.cpp
	src/wearable.cpp

Change-Id: Ic99d377a88959253d1f33cc95977433209663e03

diff --cc CMakeLists.txt
index e17eaadc208f48a3861ebb9f81bc616b6fa45cd9,d4152f49c01a2874013101471d759c6a49289cbe..a2b55cfc8bf5fd34e05ca3a6fe4d84aaec7cf6ca
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -53,11 -58,9 +58,10 @@@ SET(PKG_MODUL
      vconf
      deviced
      dlog
-     glib-2.0
-     gobject-2.0
-     capi-network-connection
      ecore
      edbus
+     capi-network-connection
++    glib-2.0
  )
  
  pkg_check_modules(PKGS REQUIRED ${PKG_MODULE})

diff --cc packaging/emuld.spec
index b9b9edabd8412d69d76df1f272b766d15aff54ba,3f873a3eddc0251c61b9ad79816b87f5c9521fe2..1d131e6e961ba625992eba83a424d4ef98dc2d00
--- 1/packaging/emuld.spec
--- 2/packaging/emuld.spec
+++ b/packaging/emuld.spec
@@@ -26,11 -26,17 +26,17 @@@ A emulator daemon is used for communica
  %prep
  %setup -q
  
- #%if "%{?tizen_profile_name}" == "mobile"
 -%if "%{?tizen_profile_name}" == "mobile"
++%if "%{?profile}" == "mobile"
  export CFLAGS+=" -DMOBILE"
- #%elseif "%{?tizen_profile_name}" == "wearable"
- #export CFLAGS+=" -DWEARABLE"
- #%endif
+ %else
 -%if "%{?tizen_profile_name}" == "wearable"
++%if "%{?profile}" == "wearable"
+ export CFLAGS+=" -DWEARABLE"
+ %else
 -%if "%{?tizen_profile_name}" == "tv"
++%if "%{?profile}" == "tv"
+ export CFLAGS+=" -DTV"
+ %endif
+ %endif
+ %endif
  
  cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}