[IMPROVE] Add Tizen 2.4 wearable support 80/46980/1
authorAlexander Aksenov <a.aksenov@samsung.com>
Thu, 27 Aug 2015 10:02:15 +0000 (13:02 +0300)
committerAlexander Aksenov <a.aksenov@samsung.com>
Thu, 27 Aug 2015 11:13:18 +0000 (14:13 +0300)
Changed build requires and some scripts

Change-Id: Ib686526a86f6f8eb545cb3e2a9f375ae5616ab82
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>
packaging/swap-manager.spec
scripts/gen_nsp_data.sh
scripts/gen_wsp_data.sh

index 19308ca..34ccb1e 100644 (file)
@@ -29,7 +29,12 @@ BuildRequires:  webkit2-efl-tv-debuginfo
 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
 %if "%{TIZEN_PRODUCT_TV}" != "1"
 BuildRequires:  app-core-debuginfo
@@ -52,6 +57,7 @@ This binary will be installed in target.
 pushd scripts
 echo "__tizen_profile_name__="%{?tizen_profile_name} > dyn_vars
 echo "__tizen_product_tv__="%{?TIZEN_PRODUCT_TV} >> dyn_vars
+echo "__tizen_product_2_4_wearable__="%{sec_product_feature_profile_wearable} >> dyn_vars
 popd
 cd daemon
 
@@ -62,8 +68,10 @@ SWAP_BUILD_CMD+=" CALL_MNGR=y"
 %if "%{?tizen_profile_name}" == "tv"
 SWAP_BUILD_CMD+=" PROFILE_TV=y"
 %else
+%if "%{sec_product_feature_profile_wearable}" != "1"
 SWAP_BUILD_CMD+=" WSP_SUPPORT=y"
 %endif
+%endif
 
 SWAP_BUILD_CMD+=" make"
 eval ${SWAP_BUILD_CMD}
index 232a3da..5014060 100755 (executable)
@@ -46,8 +46,15 @@ fi
 check_null_or_exit dpath_app_core_efl
 
 # get launchpad path
-path_launchpad=$(rpm -ql launchpad | grep launchpad-loader | head -1)
-path_launchpad=${path_launchpad:-$(rpm -ql launchpad | grep launchpad-process-pool | head -1)}
+if [ "$__tizen_product_2_4_wearable__" == "1" ]; then
+       path_launchpad=$(rpm -ql launchpad-loader | grep launchpad-loader | head -1)
+       path_launchpad=${path_launchpad:-$(rpm -ql launchpad-process-pool | grep launchpad-process-pool | head -1)}
+else
+       path_launchpad=$(rpm -ql launchpad | grep launchpad-loader | head -1)
+       path_launchpad=${path_launchpad:-$(rpm -ql launchpad | grep launchpad-process-pool | head -1)}
+fi
+
+
 check_null_or_exit path_launchpad
 
 
index 7d1cd95..18adec2 100755 (executable)
@@ -97,7 +97,7 @@ gen_array()
 }
 
 
-if [ "$__tizen_profile_name__" == "tv" ]; then
+if [ "$__tizen_profile_name__" == "tv" ] || [ "$__tizen_product_2_4_wearable__" == "1" ]; then
        add_func_plt soup_requester_request_uri@plt soup_request
        add_func _ZN7WebCore14ResourceLoader15willSendRequestERNS_15ResourceRequestERKNS_16ResourceResponseE main_res_will
        add_func _ZN7WebCore11CachedImage7addDataEPKcj main_res_add