[NextBrowser] Disabled tpk generation wih build-next-browser switch

Change-Id: I47afd9fd226da0c140389b34e36c8ebcb18f7182
Signed-off-by: saurabh.t3 <saurabh.t3@samsung.com>

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 1f429ec8237c13c89287ed8622364d0b3f807abf..6788d5129c77d49b620f63f674d6209b4cf79ad6 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -69,7 +69,13 @@ Source1: content_shell.in
 %define __is_tizen_x 0
 %endif
 
-%if 0%{?_build_next_browser:1}
+%if 0%{?_create_next_browser_tpk:1}
+ %define __create_next_browser_tpk 1
+%else
+ %define __create_next_browser_tpk 0
+%endif
+
+%if 0%{?_build_next_browser:1} || 0%{__create_next_browser_tpk}
  %define __build_next_browser 1
 %else
  %define __build_next_browser 0
@@ -483,7 +489,7 @@ Summary: Chromium EFL TPK
 Browser Engine based on Chromium EFL (TPK)
 %endif
 
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
 %package next_browser_tpk
 Summary: Chromium Next Browser TPK
 %description next_browser_tpk
@@ -954,7 +960,7 @@ echo %{version} > "%{OUTPUT_FOLDER}"/version
 
 # Prepare Tizen App Manifest
 %if "%{?profile}" == "tv"
-  %if 0%{?__build_next_browser}
+  %if 0%{?__create_next_browser_tpk}
     %define _manifestname %{__browser_tpk_id}
   %else
     %define _manifestname %{_pkgid}-vd
@@ -974,7 +980,7 @@ sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
     packaging/%{_manifestname}.xml.in \
     > "%{OUTPUT_FOLDER}"/tizen-manifest-tpk.xml
 %endif
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
 %define nb_chromium_version 1.1.123
 sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
     -e 's#@CHROMIUM_VERSION@#%{nb_chromium_version}#g' \
@@ -1208,7 +1214,7 @@ install -m 0644 -p -D %{OUTPUT_FOLDER}/snapshot_blob.bin     %{buildroot}%{TIZEN
   %endif
 %endif
 
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
   %if "%{?profile}" == "tv"
     # Clear %{_rpm_strip_option} macro to strip all symbols.
     echo "Clear _rpm_strip_option=%{?_rpm_strip_option} to strip all symbols."
@@ -1509,7 +1515,7 @@ pkgcmd -i -t tpk -p %{CHROMIUM_TPK_DIR}/%{_tpk_file_name}.tpk
 rm -rf %{CHROMIUM_TPK_DIR}/%{_tpk_file_name}.tpk
 %endif
 
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
 %preun next_browser_tpk
 pkgcmd -un %{__browser_tpk_id}
 
@@ -1649,7 +1655,7 @@ rm -rf %{TIZEN_V8_UT_DIR}/v8
 %{CHROMIUM_TPK_DIR}/*.tpk
 %endif
 
-%if 0%{?__build_next_browser}
+%if 0%{?__create_next_browser_tpk}
 %files next_browser_tpk
 %defattr(-,root,root,-)
 %{CHROMIUM_TPK_DIR}/browser_tpk/*

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index a8b2e01e9905049af1b614f1cf4b33da971cce49..be5f84ccc44d8f7bca3a6ac09481861555b1025d 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -335,6 +335,9 @@ function setupAndExecuteTargetBuild() {
     --build-next-browser)
         ARGS+=(--define "_build_next_browser 1")
     ;;
+    --create-next-browser-tpk)
+        ARGS+=(--define "_create_next_browser_tpk 1")
+    ;;
     *)
       ARGS+=("$1")
     ;;