[NextBrowser] Copying next_browser binaries in buildroot before

packaging them in next_browser tpk.
This causes to apply stripping on next_browser binary files.
Build command :
./tizen_src/build/build_tv.sh --create-next-browser-tpk --squashfs --define "tpktype upgrade"

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

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 205099f3c3333cd5573f00c0521db573930e36ef..6bfdc1cecf79d64f2a3d76a9e297e57feacf28d0 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -1182,6 +1182,32 @@ install -m 0644 -p -D %{OUTPUT_FOLDER}/snapshot_blob.bin     %{buildroot}%{TIZEN
 %endif
 %endif
 
+%if 0%{?__create_next_browser_tpk}
+  #%define _buildroot_next_browser "%{buildroot}"/NextBrowser
+
+  install -d %{_buildroot_next_browser}
+  install -d %{_buildroot_next_browser}/bin
+  install -d %{_buildroot_next_browser}/bin/locales
+  install -d %{_buildroot_next_browser}/lib
+  install -d %{_buildroot_next_browser}/res
+  install -d %{_buildroot_next_browser}/res/images
+  #May be used later to support multi-language
+  #install -d %{_buildroot_next_browser}/res/locale
+  install -d %{_buildroot_next_browser}/res/themes
+
+  install -m 0644 "%{OUTPUT_FOLDER}"/chrome_100_percent.pak %{_buildroot_next_browser}/bin
+  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
+  install -m 0644 "%{OUTPUT_FOLDER}"/snapshot_blob.bin  %{_buildroot_next_browser}/bin/
+
+  install -m 0644 "%{OUTPUT_FOLDER}"/images/*.png    %{_buildroot_next_browser}/res/images
+  install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj %{_buildroot_next_browser}/res/themes
+
+  install -m 0755 "%{OUTPUT_FOLDER}"/libchromium-ewk.so %{_buildroot_next_browser}/lib
+  install -m 0755 ./components/samsung/samsung_cloud/libsamsungcloud.so %{_buildroot_next_browser}/lib
+%endif
+
 %if 0%{?__make_squashfs_rpm}
   install -d "%{buildroot}"%{CHROMIUM_APP_DIR}/res
   # Make squashfs image of chromium-efl after extracting debuginfo
@@ -1202,23 +1228,11 @@ install -m 0644 -p -D %{OUTPUT_FOLDER}/snapshot_blob.bin     %{buildroot}%{TIZEN
     %{__tpk_install_post} \
     %{nil}
 %else
-
-  %if %{__create_next_browser_tpk}
-    %define __squashfs_rpm_install_post \
-      %{?__sandbox_chmod_cmd} \
-      install -d "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/lib/lib \
-      install -m 0644 "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/libchromium-impl.so "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/lib/lib \
-      mksquashfs "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/lib "%{buildroot}"%{CHROMIUM_APP_DIR}/res/%{name}.img -all-root \
-      rm -rf "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/lib \
-      %{__tpk_install_post} \
-      %{nil}
-  %else
-    %define __squashfs_rpm_install_post \
-      %{?__sandbox_chmod_cmd} \
-      mksquashfs "%{buildroot}"%{CHROMIUM_LIB_DIR} "%{buildroot}"%{CHROMIUM_APP_DIR}/res/%{name}.img -all-root \
-      %{__tpk_install_post} \
-      %{nil}
-  %endif
+  %define __squashfs_rpm_install_post \
+    %{?__sandbox_chmod_cmd} \
+    mksquashfs "%{buildroot}"%{CHROMIUM_LIB_DIR} "%{buildroot}"%{CHROMIUM_APP_DIR}/res/%{name}.img -all-root \
+    %{__tpk_install_post} \
+    %{nil}
 %endif
 
  # Force stripping all symbols
@@ -1240,7 +1254,7 @@ install -m 0644 -p -D %{OUTPUT_FOLDER}/snapshot_blob.bin     %{buildroot}%{TIZEN
 
   %define _browser_tpk_file_name %{__browser_tpk_id}
   %define _browser_tpk_install_post \
-    tizen_src/build/build_next_browser_tpk.sh "%{buildroot}"%{CHROMIUM_LIB_DIR} %{OUTPUT_FOLDER} %{_browser_tpk_file_name} %{__browser_tpk_id} %{?profile} \
+    tizen_src/build/build_next_browser_tpk.sh %{_buildroot_next_browser} %{OUTPUT_FOLDER} %{_browser_tpk_file_name} %{__browser_tpk_id} %{?profile} \
     install -d "%{buildroot}"%{CHROMIUM_TPK_DIR}/browser_tpk/ \
     install -m 644 "%{OUTPUT_FOLDER}"/%{_browser_tpk_file_name}.tpk "%{buildroot}"%{CHROMIUM_TPK_DIR}/browser_tpk/
 
@@ -1250,7 +1264,8 @@ install -m 0644 -p -D %{OUTPUT_FOLDER}/snapshot_blob.bin     %{buildroot}%{TIZEN
 #    cp -f "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/* "%{buildroot}"/NextBrowser/chromium/lib \
 #    mksquashfs "%{buildroot}"/NextBrowser/chromium "%{buildroot}"/NextBrowser/%{name}.img -all-root \
     %{_browser_tpk_install_post} \
-#    rm -rf "%{buildroot}"/NextBrowser \
+    rm -rf %{_buildroot_next_browser} \
+    rm -rf "%{buildroot}"%{_libdir}/debug/NextBrowser \
     %{nil}
 %endif
 

diff --git a/tizen_src/build/build_next_browser_tpk.sh b/tizen_src/build/build_next_browser_tpk.sh
index 910eda37aebf7e6c0fb303a9ec53c7acf036ff25..2b5c1a70f238e4a28b4a7e34299df2e2595fc778 100755 (executable)
--- a/tizen_src/build/build_next_browser_tpk.sh
+++ b/tizen_src/build/build_next_browser_tpk.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ro_lib_root=$1
+build_root_next_browser=$1
 output_dir=$2
 tpk_root=${output_dir}/tpk_root
 tpk_fname=${3}.tpk
@@ -10,7 +10,7 @@ profile=$5
 echo "Start $0..."
 echo "ARGS=$@"
 echo "PWD=$PWD"
-echo "ro_lib_root=$ro_lib_root"
+echo "build_root_next_browser=$build_root_next_browser"
 echo "tpk_root=$tpk_root"
 echo "tpk_fname=$tpk_fname"
 echo "tpk_id=$tpk_id"
@@ -44,36 +44,20 @@ install -d ${tpk_root}/res/images
 #install -d ${tpk_root}/res/locale
 install -d ${tpk_root}/res/themes
 
-
-
-
 install -m 0644 ${output_dir}/version            ${tpk_root}/
-
-install -m 0644 ${output_dir}/chrome_100_percent.pak ${tpk_root}/bin
-#install -m 0755 ${ro_lib_root}/bin/chrome_crashpad_handler ${tpk_root}/bin
-install -m 0755 ${ro_lib_root}/bin/next_browser ${tpk_root}/bin
-#install -m 0644 ${output_dir}/content_shell.pak  ${tpk_root}/bin
-install -m 0644 ${output_dir}/icudtl.dat           ${tpk_root}/bin
-install -m 0644 ${output_dir}/locales/*.pak ${tpk_root}/bin/locales
-install -m 0644 ${output_dir}/resources.pak ${tpk_root}/bin
-install -m 0644 ${output_dir}/snapshot_blob.bin  ${tpk_root}/bin/
-
-install -m 0644 ${output_dir}/images/*.png    ${tpk_root}/res/images
-install -m 0644 ${output_dir}/resources/*.edj ${tpk_root}/res/themes
-
-#install -m 0755 ${ro_lib_root}/lib/libchromium-impl.so ${tpk_root}/lib
-install -m 0755 ${output_dir}/libchromium-ewk.so ${tpk_root}/lib
-install -m 0755 ./components/samsung/samsung_cloud/libsamsungcloud.so ${tpk_root}/lib
-
-#install -m 0644 ${ro_lib_root}/../../../NextBrowser/chromium-efl.img ${tpk_root}/res/
+install -m 0644 ${build_root_next_browser}/bin/chrome_100_percent.pak ${tpk_root}/bin
+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}/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
+install -m 0755 ${build_root_next_browser}/lib/libsamsungcloud.so ${tpk_root}/lib
 
 # Test signing
-sign_file ${tpk_root}/bin/chrome_crashpad_handler
 sign_file ${tpk_root}/bin/next_browser
 sign_dir ${tpk_root}/lib
-#sign_file ${tpk_root}/lib/libchromium-impl.so
-#sign_file ${tpk_root}/lib/libchromium-ewk.so
-#sign_file ${tpk_root}/lib/libatomic.so*
 
 /usr/bin/hash-signer.sh -a -d -p platform -b ./ ${tpk_root}