Merge branch 'tizen_2.4_dev' into tizen

Change-Id: I99cee869615515119a202964305f8a01203ea043

diff --cc daemon/Makefile
index 0e3b60a,be470f6..7cb31c6
--- 1/daemon/Makefile
--- 2/daemon/Makefile
+++ b/daemon/Makefile
@@@ -132,8 -155,18 +141,11 @@@ SCRIPTS := 
  all: debug
  
  GENERATED_DIR = include/generated
 -GENERATED_WSI_PROF_H = include/generated/wsi_prof.h
 -GENERATED_NSP_H = include/generated/nsp_data.h
 -GENERATED_HEADERS := \
 -      $(GENERATED_WSI_PROF_H) \
 -      $(GENERATED_NSP_H)
 -
 -$(GENERATED_WSI_PROF_H): ../scripts/gen_wsi_prof.sh
 -      sh $< > $@
 +GENERATED_HEADERS :=
  
+ #Loader
+ $(INIT_LOADER_SH): $(LOADER_SCRIPT)
+       bash $< $@
  
  #Preload
  $(INIT_PRELOAD_SH): $(PRELOAD_SCRIPT)

diff --cc daemon/da_inst.h
index 60ed9be,3b29d1c..f7e9efe
--- 1/daemon/da_inst.h
--- 2/daemon/da_inst.h
+++ b/daemon/da_inst.h
@@@ -95,14 -95,13 +95,21 @@@ struct app_info_t *app_info_get_first(s
  struct app_info_t *app_info_get_next(struct app_list_t **app_list);
  
  struct target; // move
- void send_maps_inst_msg_to(struct target *t);
+ 
+ int ld_add_probes_by_feature(uint64_t to_enable_features_0,
+                            uint64_t to_enable_features_1,
+                            uint64_t to_disable_features_0,
+                            uint64_t to_disable_features_1,
+                            struct user_space_inst_t *us_inst,
+                            struct msg_t **msg_reply_add,
+                            struct msg_t **msg_reply_remove);
  
 +int ld_add_probes_by_feature(uint64_t to_enable_features_0,
 +                           uint64_t to_enable_features_1,
 +                           uint64_t to_disable_features_0,
 +                           uint64_t to_disable_features_1,
 +                           struct user_space_inst_t *us_inst,
 +                           struct msg_t **msg_reply_add,
 +                           struct msg_t **msg_reply_remove);
 +
  #endif /* __DA_INST_H__*/

diff --cc daemon/da_protocol.c
Simple merge

diff --cc daemon/daemon.c
index 5a4065c,9e6dd61..39350d4
--- 1/daemon/daemon.c
--- 2/daemon/daemon.c
+++ b/daemon/daemon.c
@@@ -65,9 -65,10 +65,12 @@@
  #include "smack.h"
  #include "swap_debug.h"
  #include "wsi.h"
+ #include "ui_viewer.h"
+ 
+ #include "cpp/features/feature_manager_c.h"
  
 +#include "cpp/features/feature_manager_c.h"
 +
  #define DA_WORK_DIR                   "/home/developer/sdk_tools/da/"
  #define DA_READELF_PATH                       "/home/developer/sdk_tools/da/readelf"
  #define SCREENSHOT_DIR                        "/tmp/da"

diff --cc daemon/utils.c
Simple merge

diff --cc daemon/wsi.c
index f4473b2,12ecb88..7f89fb7
--- 1/daemon/wsi.c
--- 2/daemon/wsi.c
+++ b/daemon/wsi.c
@@@ -31,9 -31,17 +31,10 @@@
  #include <pthread.h>
  #include <libwebsockets.h>
  #include <errno.h>
 -
 -#ifdef OLD_JSON
 -#include <json/json.h>
 -#else /* OLD_JSON */
  #include <json.h>
 -#endif /* OLD_JSON */
 -
 -
  #include "wsi.h"
  #include "swap_debug.h"
+ #include "daemon.h"
  #include "da_protocol.h"
  #include "ioctl_commands.h"
  #include "smack.h"

diff --cc packaging/swap-manager.spec
index 27c4a22,c7384b4..62de8fc
--- 1/packaging/swap-manager.spec
--- 2/packaging/swap-manager.spec
+++ b/packaging/swap-manager.spec
@@@ -5,43 -5,57 +5,46 @@@ Release:    
  Group:      System/Libraries
  License:    Apache-2.0
  Source:    %{name}_%{version}.tar.gz
 -BuildRequires:  smack-devel
 -BuildRequires:  libattr-devel
 -BuildRequires:  glib2-devel
 -BuildRequires:  aul-devel
 -BuildRequires:  vconf-devel
 -BuildRequires:  capi-system-info-devel
 -BuildRequires:  capi-system-runtime-info-devel
 -BuildRequires:  libwebsockets-devel
 -BuildRequires:  wrt
 -%if "%{sec_product_feature_profile_wearable}" == "1"
 -BuildRequires:  libjson-devel
 -%else
 -BuildRequires:  pkgconfig(json-c)
 -%endif
 -BuildRequires:  pkgconfig(ecore)
 -%if "%{?tizen_profile_name}" == "mobile"
 -BuildRequires:  call-manager
 -BuildRequires:  libcall-manager-devel
 -%endif
 -BuildRequires:  swap-probe-devel
 -BuildRequires:  swap-probe-elf
 -%if "%{?tizen_profile_name}" == "tv"
 -BuildRequires:  webkit2-efl-tv
 -%if "%{TIZEN_PRODUCT_TV}" != "1"
 -BuildRequires:  webkit2-efl-tv-debuginfo
 -%endif
 -%else
 -BuildRequires:  webkit2-efl
 -BuildRequires:  webkit2-efl-debuginfo
 -%endif
 -%if "%{sec_product_feature_profile_wearable}" == "1"
 -BuildRequires:  launchpad-process-pool
 -BuildRequires:  launchpad-loader
 -%else
 -BuildRequires:  launchpad
 -%endif
 -BuildRequires:  app-core-efl
 +
 +
 +# setup config
 +%define NSP_SUPPORT 0
 +%define WSP_SUPPORT 0
 +%define WSI_SUPPORT 0
 +
 +
 +ExcludeArch: aarch64 x86_64
 +BuildRequires: smack-devel
 +BuildRequires: libattr-devel
 +BuildRequires: glib2-devel
 +BuildRequires: aul-devel
 +BuildRequires: vconf-devel
 +BuildRequires: capi-system-info-devel
 +BuildRequires: capi-system-runtime-info-devel
 +BuildRequires: pkgconfig(json-c)
 +BuildRequires: pkgconfig(ecore)
 +BuildRequires: launchpad
 +BuildRequires: app-core-efl
 +BuildRequires: libwayland-egl
+ BuildRequires:  evas-devel
+ BuildRequires:  elementary-devel
+ BuildRequires:  libXext-devel
  %if "%{TIZEN_PRODUCT_TV}" != "1"
 -BuildRequires:  app-core-debuginfo
 +BuildRequires: app-core-efl-debuginfo
  %endif
 +BuildRequires: swap-probe-devel
 +BuildRequires: swap-probe-elf
 +BuildRequires: pkgconfig(libtzplatform-config)
  
 -%if "%_project" != "Kirana_SWA_OPEN:Build" && "%_project" != "Kirana_SWA_OPEN:Daily"
 -Requires:  swap-modules
 -%endif
 -Requires:  swap-probe
 -Requires:  swap-probe-elf
 -Requires:  sdbd
 -Requires:  libwebsockets
 +
 +%define NSP_SUPPORT 1
 +# FIXME: add WSP_SUPPORT wrt webkit2-efl and webkit2-efl-debuginfo
 +# FIXME: add WSI_SUPPORT libwebsockets-devel
 +
 +Requires: swap-modules
 +Requires: swap-probe
 +Requires: swap-probe-elf
 +Requires: sdbd
  
  %description
  SWAP manager is a part of data collection back-end for DA.
@@@ -58,20 -72,26 +61,23 @@@ echo "__tizen_product_2_4_wearable__="%
  popd
  cd daemon
  
 -%if "%{?tizen_profile_name}" == "mobile"
 -SWAP_BUILD_CMD+=" CALL_MNGR=y"
 +%if %{NSP_SUPPORT}
 +  export NSP_SUPPORT=y
  %endif
  
 -%if "%{?tizen_profile_name}" == "tv"
 -SWAP_BUILD_CMD+=" PROFILE_TV=y"
 -%else
 -%if "%{sec_product_feature_profile_wearable}" == "1"
 -SWAP_BUILD_CMD+=" OLD_JSON=y"
 -%else
 -SWAP_BUILD_CMD+=" WSP_SUPPORT=y"
 +%if %{WSP_SUPPORT}
 +  export WSP_SUPPORT=y
  %endif
 +
 +%if %{WSI_SUPPORT}
 +  export WSI_SUPPORT=y
  %endif
  
 -SWAP_BUILD_CMD+=" make"
 -eval ${SWAP_BUILD_CMD}
 +make
  
+ cd ../ui_viewer
+ $SWAP_BUILD_CONF make
+ 
  %install
  rm -rf ${RPM_BUILD_ROOT}
  mkdir -p %{buildroot}/usr/share/license
@@@ -79,9 -99,12 +85,12 @@@ cp LICENSE %{buildroot}/usr/share/licen
  cd daemon
  %make_install
  
+ cd ../ui_viewer
+ %make_install
+ 
  %post
 -mkdir -p /opt/usr/etc
 -touch /opt/usr/etc/resourced_proc_exclude.ini
 +mkdir -p %{TZ_SYS_ETC}
 +touch %{TZ_SYS_ETC}/resourced_proc_exclude.ini
  
  %files
  /usr/share/license/%{name}