[NextBrowser]Build NextBrowser and Chrome Browser separately

-Solve the issue caused by enabling system icu
Change-Id: I934b16ebadbf5d2ece9188bd2fddc555d1f65a31

Change-Id: I3ae4c70be43125618a9d03bca5a63362fea2c959

diff --git a/packaging/chromium-efl-browser.spec.in b/packaging/chromium-efl-browser.spec.in
index 8f02668dce83ddb1484c32805af3e06952dbc675..60fff9ad6d6f319f3c720c212bc99d66084fd973 100644 (file)
--- a/packaging/chromium-efl-browser.spec.in
+++ b/packaging/chromium-efl-browser.spec.in
@@ -21,10 +21,13 @@ Tizen Chromium Browser Application on Chromium EFL
   install -m 0644 "%{OUTPUT_FOLDER}"/resources.pak            "%{_browser_buildpath}"/bin \
   install -m 0644 "%{OUTPUT_FOLDER}"/locales/en-US.pak        "%{_browser_buildpath}"/bin/locales \
   install -m 0644 "%{OUTPUT_FOLDER}"/snapshot_blob.bin        "%{_browser_buildpath}"/bin \
-  install -m 0644 "%{OUTPUT_FOLDER}"/icudtl.dat               "%{_browser_buildpath}"/bin \
   install -m 0644 "%{OUTPUT_FOLDER}"/product_logo_48.png      "%{_browser_buildpath}"/shared/res/%{_browser_pkgid}.png \
   %{nil}
 
+%global __install_spec_third_party_icu \
+  install -m 0644 "%{OUTPUT_FOLDER}"/icudtl.dat               "%{_browser_buildpath}"/bin \
+%{nil}
+
 %files browser
 %manifest packaging/chromium-efl.manifest
 %{_xmldir}/%{_browser_pkgid}.xml
@@ -33,9 +36,9 @@ Tizen Chromium Browser Application on Chromium EFL
 %{_browser_rootdir}/bin/resources.pak
 %{_browser_rootdir}/bin/locales/en-US.pak
 %{_browser_rootdir}/bin/snapshot_blob.bin
+%{_browser_rootdir}/shared/res/%{_browser_pkgid}.png
 %if "%{?__use_system_icu}" != "1"
 %{_browser_rootdir}/bin/icudtl.dat
-%{_browser_rootdir}/shared/res/%{_browser_pkgid}.png
 %endif
 
 %preun browser

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 3a2a93d4c47901cd0be906a050643d1b294242ed..50e6b3619bad326e1e5c5afadaff77658a8909ab 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -68,13 +68,13 @@ Source2: chromium-efl-engine.spec.in
 
 %if 0%{?_create_next_browser_tpk:1}
  %define __create_next_browser_tpk 1
- %define __build_chrome 1
+ %define __build_chrome 0
 %else
  %define __create_next_browser_tpk 0
 %endif
 
 %if 0%{?__build_chrome}
-#Source3: chromium-efl-browser.spec.in
+Source3: chromium-efl-browser.spec.in
 %endif
 
 %if "%{?_tizen_release_build}" == "1"
@@ -690,10 +690,10 @@ Chromium Tizen V8 unittests
 %define include_sub_spec() %{expand:%(cat '%{1}')}
 %{include_sub_spec %{SOURCE2}}
 
-#%if 0%{?__build_chrome}
-#%define include_sub_spec() %{expand:%(cat '%{1}')}
-#%{include_sub_spec %{SOURCE3}}
-#%endif
+%if 0%{?__build_chrome}
+%define include_sub_spec() %{expand:%(cat '%{1}')}
+%{include_sub_spec %{SOURCE3}}
+%endif
 
 %prep
 %setup -q
@@ -850,7 +850,11 @@ fi
   "use_system_icu=false" \
 %endif
   "tizen_release_build=%{macro_to_bool _tizen_release_build}" \
-  "build_chrome=%{macro_to_bool __build_chrome}" \
+%if 0%{?__build_chrome} || %{__create_next_browser_tpk} == 1
+  "build_chrome=true" \
+%else
+  "build_chrome=false" \
+%endif
 %if "%{?tizen_profile_name}" == "tv"
   "lib_dir_path=\"%{_libdir}\"" \
 %endif
@@ -1047,7 +1051,6 @@ sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
 %endif
 
 %if 0%{?__create_next_browser_tpk}
-
 sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
     -e 's#@CHROMIUM_VERSION@#%{__next_browser_version}#g' \
     -e 's#@PACKAGE_ID@#%{__browser_tpk_id}#g' \
@@ -1055,12 +1058,12 @@ sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
     > "%{OUTPUT_FOLDER}"/tizen-manifest-next-browser-tpk.xml
 %endif
 
-#%if 0%{?__build_chrome}
-#sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
- #   -e 's#@CHROMIUM_VERSION@#%{version}#g' \
-  #  packaging/%{_pkgid}-browser.xml.in \
-  #  > "%{OUTPUT_FOLDER}"/tizen-manifest-browser.xml
-#%endif
+%if 0%{?__build_chrome}
+sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
+    -e 's#@CHROMIUM_VERSION@#%{version}#g' \
+   packaging/%{_pkgid}-browser.xml.in \
+    > "%{OUTPUT_FOLDER}"/tizen-manifest-browser.xml
+%endif
 
 %if 0%{?__generate_tpk} && "%{?profile}" == "tv"
 # add build_id to tizen-manifest
@@ -1133,7 +1136,7 @@ mkdir -p %{buildroot}%{_datadir}/gcov/obj
 install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %endif
 
-%if %{__build_chrome} == 1 && "%{__generate_tpk}" == "0"
+%if %{__create_next_browser_tpk} == 1 && "%{__generate_tpk}" == "0"
   install -m 0755 "%{OUTPUT_FOLDER}"/%{__browser_binary_name} "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/%{__browser_binary_name}
   sed 's#@binary@#%{CHROMIUM_LIB_DIR}/bin/%{__browser_binary_name}#' %{SOURCE1} > "%{buildroot}"%{_bindir}/%{__browser_binary_name}
   install -m 0644 "%{OUTPUT_FOLDER}"/locales/*.pak "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/locales
@@ -1182,7 +1185,7 @@ install -m 0755 "%{OUTPUT_FOLDER}"/ubrowser          "%{buildroot}"%{CHROMIUM_AP
   install -m 0644 "%{OUTPUT_FOLDER}"/libchromium-impl.so "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/
 %else
   install -m 0644 "%{OUTPUT_FOLDER}"/libchromium-ewk.so  "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/
-  %endif
+%endif
 %endif
 %if 0%{?__enable_platform_api_wrapper}
   install -m 0644 ./tizen_src/platform_api_wrapper/libchromium-efl-platform-api-wrapper.so "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/
@@ -1276,7 +1279,9 @@ install -m 0644 -p -D %{OUTPUT_FOLDER}/snapshot_blob.bin     %{buildroot}%{TIZEN
   install -m 0755 "%{OUTPUT_FOLDER}"/%{__browser_binary_name} %{_buildroot_next_browser}/bin
   install -m 0644 "%{OUTPUT_FOLDER}"/locales/*.pak %{_buildroot_next_browser}/bin/locales
   install -m 0644 "%{OUTPUT_FOLDER}"/resources.pak %{_buildroot_next_browser}/bin
+%if "%{?__use_system_icu}" != "1"
   install -m 0644 "%{OUTPUT_FOLDER}"/icudtl.dat %{_buildroot_next_browser}/bin
+%endif
   install -m 0644 "%{OUTPUT_FOLDER}"/snapshot_blob.bin  %{_buildroot_next_browser}/bin/
   install -m 0755 "%{OUTPUT_FOLDER}"/extensions/*.crx %{_buildroot_next_browser}/bin/extensions
 
@@ -1530,7 +1535,10 @@ tar -cj -f "%{buildroot}"%{TIZEN_V8_UT_DIR}/v8-test-data.tar.bz2 v8/tools/ v8/te
 #size -G "%{buildroot}%{CHROMIUM_LIB_DIR}/lib/libchromium-impl.so"
 
 %if 0%{?__build_chrome}
-  #%{__browser_install_spec}
+  %{__browser_install_spec}
+%if "%{?__use_system_icu}" != "1"
+  %{__install_spec_third_party_icu}
+%endif
   # tizen_src/build/build_chromium_browser_tpk.sh %{_buildroot_next_browser} %{OUTPUT_FOLDER} %{_browser_tpk_file_name} %{__browser_tpk_id} %{?profile}
 %endif
 
@@ -1697,7 +1705,7 @@ rm -rf %{TIZEN_V8_UT_DIR}/v8
 %{CHROMIUM_LIB_DIR}/bin/locales/*.pak
 %{CHROMIUM_LIB_DIR}/res/locale/*
 
-%if %{__build_chrome} == 1 && "%{__generate_tpk}" == "0"
+%if %{__create_next_browser_tpk} == 1 && "%{__generate_tpk}" == "0"
   %{CHROMIUM_LIB_DIR}/bin/chrome_100_percent.pak
   %{CHROMIUM_LIB_DIR}/bin/resources.pak
   %{CHROMIUM_LIB_DIR}/bin/%{__browser_binary_name}

diff --git a/tizen_src/build/build_next_browser_tpk.sh b/tizen_src/build/build_next_browser_tpk.sh
index d072167b7e1bcd99fa4b9ffa6da28388aa025d86..88e81f24538857bbfe50108aa35e8514d97dcc59 100755 (executable)
--- a/tizen_src/build/build_next_browser_tpk.sh
+++ b/tizen_src/build/build_next_browser_tpk.sh
@@ -51,7 +51,7 @@ install -m 0755 ${build_root_next_browser}/bin/next_browser ${tpk_root}/bin
 install -m 0644 ${build_root_next_browser}/bin/locales/*.pak ${tpk_root}/bin/locales
 install -m 0644 ${build_root_next_browser}/bin/resources.pak ${tpk_root}/bin
 install -m 0644 ${build_root_next_browser}/bin/snapshot_blob.bin  ${tpk_root}/bin/
-install -m 0644 ${build_root_next_browser}/bin/icudtl.dat ${tpk_root}/bin
+#install -m 0644 ${build_root_next_browser}/bin/icudtl.dat ${tpk_root}/bin
 install -m 0644 ${build_root_next_browser}/res/images/*.png    ${tpk_root}/res/images
 install -m 0644 ${build_root_next_browser}/res/themes/*.edj ${tpk_root}/res/themes
 install -m 0755 ${build_root_next_browser}/lib/libchromium-ewk.so ${tpk_root}/lib