diff options
| author | Eugene Kurzberg <i.kurtsberg@samsung.com> | 2017-07-21 13:21:17 +0300 |
|---|---|---|
| committer | Eugene Kurzberg <i.kurtsberg@samsung.com> | 2017-07-21 13:21:17 +0300 |
| commit | aa0752b1002c3af3b58988243a8748695316c6d6 (patch) | |
| tree | e9587a3cc35f5892a0685e16165a6614f0d9ca9c | |
| parent | 626dc602829c705e52c68b24f3385bd2f30b6e8c (diff) | |
| parent | 362baedf305a3745c42b082cabe2d3b444d8798e (diff) | |
| download | alarm-aa0752b1002c3af3b58988243a8748695316c6d6.tar.gz alarm-aa0752b1002c3af3b58988243a8748695316c6d6.tar.bz2 alarm-aa0752b1002c3af3b58988243a8748695316c6d6.zip | |
Merge branch 'tizen' into tizen_devtizen_dev
Change-Id: Ida86ac31a70a379dd7f7383563062bae6d8c86ed
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>
| -rw-r--r-- | alarm-app/.cproject | 155 | ||||
| -rw-r--r-- | alarm-app/.tproject | 2 | ||||
| -rw-r--r-- | alarm-app/project_def.prop | 2 | ||||
| -rw-r--r-- | alarm-app/tizen-manifest.xml | 4 | ||||
| -rw-r--r-- | alarm-svc/.cproject | 135 | ||||
| -rw-r--r-- | alarm-svc/.tproject | 2 | ||||
| -rw-r--r-- | alarm-svc/project_def.prop | 2 | ||||
| -rw-r--r-- | alarm-svc/tizen-manifest.xml | 2 | ||||
| -rw-r--r-- | alarm-widget/.cproject | 67 | ||||
| -rw-r--r-- | alarm-widget/.tproject | 2 | ||||
| -rw-r--r-- | alarm-widget/inc/AlarmWidget.h | 5 | ||||
| -rw-r--r-- | alarm-widget/project_def.prop | 2 | ||||
| -rw-r--r-- | alarm-widget/tizen-manifest.xml | 2 | ||||
| -rw-r--r-- | lib-apps-common/.cproject | 160 | ||||
| -rw-r--r-- | lib-apps-common/.tproject | 2 | ||||
| -rw-r--r-- | lib-apps-common/project_def.prop | 2 | ||||
| -rw-r--r-- | lib-common/.cproject | 67 | ||||
| -rw-r--r-- | lib-common/.tproject | 2 | ||||
| -rw-r--r-- | lib-common/project_def.prop | 2 |
19 files changed, 267 insertions, 350 deletions
diff --git a/alarm-app/.cproject b/alarm-app/.cproject index a15e142..a7045d2 100644 --- a/alarm-app/.cproject +++ b/alarm-app/.cproject @@ -27,28 +27,16 @@ <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1534665950" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1200927545" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" value="true" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.1444782072" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/> </option> - <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.207325496" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"/> - <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.1089291342" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value=" -fPIE"/> - <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> - </option> - <option id="gnu.cpp.compiler.option.include.paths.1572219696" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> + <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.207325496" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -125,6 +113,15 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/yaca""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> + </option> + <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.1089291342" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value=" -fPIE"/> + <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> + </option> + <option id="gnu.cpp.compiler.option.include.paths.1572219696" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-apps-common/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-common/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-common/res/common/edje}""/> @@ -150,20 +147,16 @@ <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.855386808" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.114056857" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.409357000" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1087558577" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -249,93 +242,6 @@ </option> <option id="gnu.c.compiler.option.include.paths.1113370508" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/calendar-service2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/chromium-ewk""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ckm""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/contacts-svc""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/content""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/context-service""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/csr""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dali""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dali-toolkit""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dbus-1.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/device""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dlog""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-buffer-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-con-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-file-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-imf-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-imf-evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-input-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-input-evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-ipc-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ector-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/e_dbus-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/edje-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eet-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efreet-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eina-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eina-1/eina""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eio-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eldbus-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/elementary-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/embryo-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/emile-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eo-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eom""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ethumb-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ethumb-client-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/feedback""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/fontconfig""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/freetype2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/gio-unix-2.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/glib-2.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/harfbuzz""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/iotcon""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/json-glib-1.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/location""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/maps""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/media""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/media-content""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/yaca""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> </option> <option id="sbi.gnu.c.compiler.option.frameworks.core.1283394144" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.core" valueType="userObjs"> <listOptionValue builtIn="false" value="Native_API"/> @@ -432,20 +338,17 @@ <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.537088295" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1708003360" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.570702224" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1612390694" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -505,17 +408,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> @@ -630,20 +540,17 @@ <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.1367391729" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1872286632" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.1743949374" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.226066229" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -703,17 +610,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> @@ -800,4 +714,5 @@ <resource resourceType="PROJECT" workspacePath="/alarm-app"/> </configuration> </storageModule> + <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> </cproject> diff --git a/alarm-app/.tproject b/alarm-app/.tproject index da2678a..0bcc428 100644 --- a/alarm-app/.tproject +++ b/alarm-app/.tproject @@ -2,7 +2,7 @@ <tproject xmlns="http://www.tizen.org/tproject"> <platforms> <platform> - <name>wearable-3.0</name> + <name>wearable-4.0</name> </platform> </platforms> <package> diff --git a/alarm-app/project_def.prop b/alarm-app/project_def.prop index 30793e0..59e2b28 100644 --- a/alarm-app/project_def.prop +++ b/alarm-app/project_def.prop @@ -6,7 +6,7 @@ APPNAME = alarm-app type = app # Project Profile -profile = wearable-3.0 +profile = wearable-4.0 # C/CPP Sources USER_SRCS = src/*.cpp src/*/*.cpp diff --git a/alarm-app/tizen-manifest.xml b/alarm-app/tizen-manifest.xml index e5b757a..4c68307 100644 --- a/alarm-app/tizen-manifest.xml +++ b/alarm-app/tizen-manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.alarm" version="1.0.0"> +<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.alarm" version="1.0.0"> <profile name="wearable"/> <ui-application appid="org.tizen.alarm" exec="alarm-app" hw-acceleration="on" multiple="false" nodisplay="false" taskmanage="true" type="capp"> <label>Alarm</label> @@ -173,8 +173,8 @@ <icon>org.tizen.alarm.png</icon> </ui-application> <privileges> - <privilege>http://tizen.org/privilege/datasharing</privilege> <privilege>http://tizen.org/privilege/haptic</privilege> + <privilege>http://tizen.org/privilege/datasharing</privilege> <privilege>http://tizen.org/privilege/display</privilege> </privileges> </manifest> diff --git a/alarm-svc/.cproject b/alarm-svc/.cproject index 37e6760..1a06328 100644 --- a/alarm-svc/.cproject +++ b/alarm-svc/.cproject @@ -27,20 +27,16 @@ <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1142838486" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1285822552" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.216823941" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.427327640" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -126,93 +122,6 @@ </option> <option id="gnu.cpp.compiler.option.include.paths.323595669" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/calendar-service2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/chromium-ewk""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ckm""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/contacts-svc""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/content""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/context-service""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/csr""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dali""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dali-toolkit""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dbus-1.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/device""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dlog""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-buffer-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-con-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-file-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-imf-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-imf-evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-input-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-input-evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-ipc-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ector-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/e_dbus-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/edje-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eet-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efreet-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eina-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eina-1/eina""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eio-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eldbus-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/elementary-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/embryo-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/emile-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eo-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eom""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ethumb-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ethumb-client-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/evas-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/feedback""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/fontconfig""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/freetype2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/gio-unix-2.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/glib-2.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/harfbuzz""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/iotcon""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/json-glib-1.0""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/location""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/maps""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/media""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/media-content""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/yaca""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-apps-common/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-common/inc}""/> </option> @@ -228,20 +137,16 @@ <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.140042268" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1539569590" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.2095350654" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1794908614" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -408,20 +313,17 @@ <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.621839332" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1945744520" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.1452497168" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1097802692" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -481,17 +383,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> @@ -518,20 +427,17 @@ <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.1832023687" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.522311211" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.604786371" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1880326650" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -591,17 +497,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> diff --git a/alarm-svc/.tproject b/alarm-svc/.tproject index de5a150..dd94734 100644 --- a/alarm-svc/.tproject +++ b/alarm-svc/.tproject @@ -2,7 +2,7 @@ <tproject xmlns="http://www.tizen.org/tproject"> <platforms> <platform> - <name>wearable-3.0</name> + <name>wearable-4.0</name> </platform> </platforms> <package> diff --git a/alarm-svc/project_def.prop b/alarm-svc/project_def.prop index 9e4d9a1..8233033 100644 --- a/alarm-svc/project_def.prop +++ b/alarm-svc/project_def.prop @@ -6,7 +6,7 @@ APPNAME = alarm-svc type = app # Project Profile -profile = wearable-3.0 +profile = wearable-4.0 # C/CPP Sources USER_SRCS = src/*.cpp diff --git a/alarm-svc/tizen-manifest.xml b/alarm-svc/tizen-manifest.xml index 5fe2388..3a60c74 100644 --- a/alarm-svc/tizen-manifest.xml +++ b/alarm-svc/tizen-manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.alarm" version="1.0.0"> +<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.alarm" version="1.0.0"> <profile name="wearable"/> <service-application appid="org.tizen.alarm.svc" exec="alarm-svc" multiple="false" nodisplay="true" taskmanage="false" type="capp"> <label>Alarm Service</label> diff --git a/alarm-widget/.cproject b/alarm-widget/.cproject index 8bec9d2..81cda4f 100644 --- a/alarm-widget/.cproject +++ b/alarm-widget/.cproject @@ -27,28 +27,16 @@ <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1955087006" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1683711769" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.497420493" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/> </option> - <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.764143499" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"/> - <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.2033865535" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value=" -fPIE"/> - <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> - </option> - <option id="gnu.cpp.compiler.option.include.paths.346922979" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> + <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.764143499" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -125,6 +113,15 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/yaca""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> + </option> + <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.2033865535" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value=" -fPIE"/> + <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> + </option> + <option id="gnu.cpp.compiler.option.include.paths.346922979" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-apps-common/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-common/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/alarm-widget/res/widget/edje}""/> @@ -147,20 +144,16 @@ <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1511700436" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.140857365" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.347821032" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.567628419" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -337,20 +330,17 @@ <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1124834220" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.888684395" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.302611782" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1492992247" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -410,17 +400,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> @@ -447,20 +444,17 @@ <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.336765339" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1638602816" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.323390120" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.130579035" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -520,17 +514,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> diff --git a/alarm-widget/.tproject b/alarm-widget/.tproject index de5a150..dd94734 100644 --- a/alarm-widget/.tproject +++ b/alarm-widget/.tproject @@ -2,7 +2,7 @@ <tproject xmlns="http://www.tizen.org/tproject"> <platforms> <platform> - <name>wearable-3.0</name> + <name>wearable-4.0</name> </platform> </platforms> <package> diff --git a/alarm-widget/inc/AlarmWidget.h b/alarm-widget/inc/AlarmWidget.h index 3cd9e66..56feea8 100644 --- a/alarm-widget/inc/AlarmWidget.h +++ b/alarm-widget/inc/AlarmWidget.h @@ -17,10 +17,13 @@ #ifndef ALARM_WIDGET_H #define ALARM_WIDGET_H -#include <Elementary.h> #include "App/Widget.h" #include "Common/Model/Alarm.h" +#include <app_control.h> +#include <Elementary.h> + + namespace Common { namespace Model diff --git a/alarm-widget/project_def.prop b/alarm-widget/project_def.prop index 6482849..1e8694f 100644 --- a/alarm-widget/project_def.prop +++ b/alarm-widget/project_def.prop @@ -6,7 +6,7 @@ APPNAME = alarm-widget type = app # Project Profile -profile = wearable-3.0 +profile = wearable-4.0 # C/CPP Sources USER_SRCS = src/*.cpp diff --git a/alarm-widget/tizen-manifest.xml b/alarm-widget/tizen-manifest.xml index ccfead9..1c52ce8 100644 --- a/alarm-widget/tizen-manifest.xml +++ b/alarm-widget/tizen-manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.alarm" version="1.0.0"> +<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.alarm" version="1.0.0"> <profile name="wearable"/> <widget-application appid="org.tizen.alarm.widget" exec="alarm-widget" main="true" update-period="0"> <label>Alarm</label> diff --git a/lib-apps-common/.cproject b/lib-apps-common/.cproject index 5f35208..6f4facb 100644 --- a/lib-apps-common/.cproject +++ b/lib-apps-common/.cproject @@ -31,9 +31,93 @@ <option id="gnu.cpp.compiler.option.optimization.level.1307601566" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/> <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.461027468" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.cpp.compiler.option.2051801621" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.sharedLib"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.sharedLib"/> + </option> + <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1415764853" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/calendar-service2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/chromium-ewk""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ckm""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/contacts-svc""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/content""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/context-service""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/csr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dali""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dali-toolkit""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dbus-1.0""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/device""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/dlog""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-buffer-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-con-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-evas-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-file-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-imf-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-imf-evas-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-input-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-input-evas-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ecore-ipc-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ector-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/e_dbus-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/edje-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eet-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efreet-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eina-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eina-1/eina""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eio-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eldbus-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/elementary-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/embryo-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/emile-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eo-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eom""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ethumb-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ethumb-client-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/evas-1""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/feedback""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/fontconfig""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/freetype2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/gio-unix-2.0""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/glib-2.0""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/harfbuzz""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/iotcon""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/json-glib-1.0""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/location""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/maps""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/media""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/media-content""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/yaca""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> </option> - <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1415764853" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"/> <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.202796369" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> @@ -43,11 +127,6 @@ <option id="gnu.cpp.compiler.option.include.paths.1911330740" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> @@ -128,7 +207,8 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/yaca""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/lib-apps-common/inc}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks.core.1298366398" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.core" valueType="userObjs"> <listOptionValue builtIn="false" value="Native_API"/> @@ -141,27 +221,16 @@ <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1283783498" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1476929975" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.c.compiler.option.1342406868" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.sharedLib"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.sharedLib"/> </option> - <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.964062508" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"/> - <option id="sbi.gnu.c.compiler.option.frameworks_cflags.core.1899049793" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.c.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> - <listOptionValue builtIn="false" value="-fvisibility=hidden"/> - </option> - <option id="gnu.c.compiler.option.include.paths.1175192691" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> + <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.964062508" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -239,6 +308,13 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> </option> + <option id="sbi.gnu.c.compiler.option.frameworks_cflags.core.1899049793" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.c.compiler.option.frameworks_cflags.core" valueType="stringList"> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> + <listOptionValue builtIn="false" value="-fvisibility=hidden"/> + </option> + <option id="gnu.c.compiler.option.include.paths.1175192691" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths"/> <option id="sbi.gnu.c.compiler.option.frameworks.core.1735226027" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.core" valueType="userObjs"> <listOptionValue builtIn="false" value="Native_API"/> </option> @@ -261,7 +337,7 @@ </inputType> </tool> <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1318331354" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base"> - <option id="gnu.both.asm.option.include.paths.1734161924" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"/> + <option id="gnu.both.asm.option.include.paths.1734161924" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.355459312" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> </tool> <tool id="org.tizen.nativecore.tool.fnmapgen.1427582863" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/> @@ -271,13 +347,13 @@ <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.900004470" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/> <tool id="org.tizen.nativecore.tool.sbi.po.compiler.406097086" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/> <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.16125072" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler"> - <option id="sbi.gnu.edc.compiler.option.misc.id.174953161" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> + <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.174953161" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje""/> </option> - <option id="sbi.gnu.edc.compiler.option.misc.sd.336912890" superClass="sbi.gnu.edc.compiler.option.misc.sd" valueType="stringList"> + <option command="-sd " id="sbi.gnu.edc.compiler.option.misc.sd.336912890" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje""/> </option> - <option id="sbi.gnu.edc.compiler.option.misc.fd.24896014" superClass="sbi.gnu.edc.compiler.option.misc.fd" valueType="stringList"> + <option command="-fd " id="sbi.gnu.edc.compiler.option.misc.fd.24896014" name="Font Path (-fd)" superClass="sbi.gnu.edc.compiler.option.misc.fd" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje""/> </option> </tool> @@ -316,20 +392,17 @@ <option id="gnu.cpp.compiler.option.optimization.level.429814309" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1863199511" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.cpp.compiler.option.649106559" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1999452537" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -389,17 +462,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> @@ -425,20 +505,17 @@ <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.2137783350" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.908578800" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.c.compiler.option.1143232137" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1234914763" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -498,17 +575,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> diff --git a/lib-apps-common/.tproject b/lib-apps-common/.tproject index de5a150..dd94734 100644 --- a/lib-apps-common/.tproject +++ b/lib-apps-common/.tproject @@ -2,7 +2,7 @@ <tproject xmlns="http://www.tizen.org/tproject"> <platforms> <platform> - <name>wearable-3.0</name> + <name>wearable-4.0</name> </platform> </platforms> <package> diff --git a/lib-apps-common/project_def.prop b/lib-apps-common/project_def.prop index 0fc5974..478352e 100644 --- a/lib-apps-common/project_def.prop +++ b/lib-apps-common/project_def.prop @@ -6,7 +6,7 @@ APPNAME = apps-common type = sharedLib # Project Profile -profile = wearable-3.0 +profile = wearable-4.0 # C/CPP Sources USER_SRCS = src/*/*.cpp diff --git a/lib-common/.cproject b/lib-common/.cproject index 07dc980..f8c4e1f 100644 --- a/lib-common/.cproject +++ b/lib-common/.cproject @@ -26,28 +26,16 @@ <option id="gnu.cpp.compiler.option.optimization.level.1398093091" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/> <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.512256296" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.cpp.compiler.option.1379021540" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.sharedLib"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.sharedLib"/> </option> - <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1812812065" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"/> - <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.953420719" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> - <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> - <listOptionValue builtIn="false" value="-fvisibility=hidden"/> - </option> - <option id="gnu.cpp.compiler.option.include.paths.613393536" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> + <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1812812065" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -124,6 +112,15 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/yaca""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/dbus-1.0/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/lib/glib-2.0/include""/> + </option> + <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.953420719" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> + <listOptionValue builtIn="false" value="-fvisibility=hidden"/> + </option> + <option id="gnu.cpp.compiler.option.include.paths.613393536" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-apps-common/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/lib-common/res/common/edje}""/> </option> @@ -138,20 +135,16 @@ <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.676051183" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.202562662" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.c.compiler.option.682801576" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.sharedLib"/> + <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.sharedLib"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.925347047" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/asp/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -323,20 +316,17 @@ <option id="gnu.cpp.compiler.option.optimization.level.894602592" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1048681697" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.cpp.compiler.option.951901559" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.866331759" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -396,17 +386,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> @@ -432,20 +429,17 @@ <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.1520655019" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.633415120" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option id="sbi.gnu.c.compiler.option.1244664534" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-3.0-emulator.core_llvm37.i386.core.app"/> + <listOptionValue builtIn="false" value="wearable-3.0-emulator.core.private_llvm37.i386.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.2040777080" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/SDL2""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-watch""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appfw""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/aul/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/base""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/cairo""/> @@ -505,17 +499,24 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/metadata-editor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/minizip""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/network""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/notification""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/nsd/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/phonenumber-utils""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/pkgmgr""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/rua/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/storage""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/system""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/telephony-client""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/tzsh""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vulkan""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/watch-control/""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_dali""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/widget_viewer_evas""/> diff --git a/lib-common/.tproject b/lib-common/.tproject index de5a150..dd94734 100644 --- a/lib-common/.tproject +++ b/lib-common/.tproject @@ -2,7 +2,7 @@ <tproject xmlns="http://www.tizen.org/tproject"> <platforms> <platform> - <name>wearable-3.0</name> + <name>wearable-4.0</name> </platform> </platforms> <package> diff --git a/lib-common/project_def.prop b/lib-common/project_def.prop index 87f06d9..1729ba7 100644 --- a/lib-common/project_def.prop +++ b/lib-common/project_def.prop @@ -6,7 +6,7 @@ APPNAME = common type = sharedLib # Project Profile -profile = wearable-3.0 +profile = wearable-4.0 # C/CPP Sources USER_SRCS = src/*/*.cpp src/*/*/*.cpp |