From: Somin Kim <somin926.kim@samsung.com>
Date: Wed, 9 Mar 2016 08:51:29 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20160314.020719~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7f82a65748d5c8351fa3a87ad538c50b2838dec;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Replace timer_manager & timer_util with TimerManager
  Remove GEO_LOCATION_PRECISION parameter from Json::set()
  Replace ctx::json with ctx:Json
  device: update cmake script to support common profile
  cmake: switch the dependencies variable to list, from space separated string
  Replace namespace ctx::shared with class ctx::SharedVars
  Create one unified so instead of one so for each provider
  Replace build dependency context-common with libcontext-shared & server
  Custom item recovery logic added when initialized (Uninstalled provider's item handling is still needed)
  Added custom provider
  Remove mutexing from device_status_alarm

Signed-off-by: Somin Kim <somin926.kim@samsung.com>

Conflicts:
	src/device/CMakeLists.txt

Change-Id: I1105750bb9c0753defd1e6ce2b4d71d7acc86be8
---

f7f82a65748d5c8351fa3a87ad538c50b2838dec
diff --cc src/device/CMakeLists.txt
index 39da8d4,22f35bc..71dc652
--- a/src/device/CMakeLists.txt
+++ b/src/device/CMakeLists.txt
@@@ -1,21 -1,17 +1,20 @@@
  CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
- SET(target "ctx-device")
- SET(definitions LOG_TAG=\"CONTEXT-DEVICE\")
+ # prvd_cdef, prvd_deps, and prvd_srcs need to be set properly
  
  # Common Profile
- FILE(GLOB srcs ./*.cpp)
- SET(deps "vconf capi-system-info capi-system-device capi-system-runtime-info")
+ FILE(GLOB prvd_srcs ./*.cpp system/alarm.cpp system/time.cpp)
+ SET(prvd_deps vconf capi-system-info capi-system-device capi-system-runtime-info)
  
 +# Common Profile
 +SET(srcs ${srcs} system/alarm.cpp system/time.cpp)
 +
  # Mobile Profile
  IF("${PROFILE}" STREQUAL "mobile")
- 	SET(deps "${deps} capi-network-bluetooth capi-network-wifi")
- 	SET(deps "${deps} capi-telephony tapi msg-service capi-messaging-email motion")
- 	FILE(GLOB_RECURSE srcs ${srcs} activity/*.cpp)
- 	FILE(GLOB_RECURSE srcs ${srcs} system/*.cpp)
- 	FILE(GLOB_RECURSE srcs ${srcs} social/*.cpp)
+ 	SET(prvd_deps ${prvd_deps} capi-network-bluetooth capi-network-wifi)
+ 	SET(prvd_deps ${prvd_deps} capi-telephony tapi msg-service capi-messaging-email motion)
+ 	FILE(GLOB_RECURSE prvd_srcs ${prvd_srcs} activity/*.cpp)
+ 	FILE(GLOB_RECURSE prvd_srcs ${prvd_srcs} system/*.cpp)
+ 	FILE(GLOB_RECURSE prvd_srcs ${prvd_srcs} social/*.cpp)
  ENDIF("${PROFILE}" STREQUAL "mobile")
  
  # Wearable Profile