From 627ca837cf9243fd37eac62ef2da400bd724e130 Mon Sep 17 00:00:00 2001 From: Alexander Aksenov Date: Thu, 27 Aug 2015 13:02:15 +0300 Subject: [PATCH] [IMPROVE] Add Tizen 2.4 wearable support Changed build requires and some scripts Change-Id: Ib686526a86f6f8eb545cb3e2a9f375ae5616ab82 Signed-off-by: Alexander Aksenov --- packaging/swap-manager.spec | 8 ++++++++ scripts/gen_nsp_data.sh | 11 +++++++++-- scripts/gen_wsp_data.sh | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/packaging/swap-manager.spec b/packaging/swap-manager.spec index 19308ca..34ccb1e 100644 --- a/packaging/swap-manager.spec +++ b/packaging/swap-manager.spec @@ -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} diff --git a/scripts/gen_nsp_data.sh b/scripts/gen_nsp_data.sh index 232a3da..5014060 100755 --- a/scripts/gen_nsp_data.sh +++ b/scripts/gen_nsp_data.sh @@ -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 diff --git a/scripts/gen_wsp_data.sh b/scripts/gen_wsp_data.sh index 7d1cd95..18adec2 100755 --- a/scripts/gen_wsp_data.sh +++ b/scripts/gen_wsp_data.sh @@ -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 -- 2.7.4