Date: Friday, January 6, 2023 @ 15:58:30
  Author: archange
Revision: 1378640

Sync more with chromium, enable pgo

Modified:
  electron/trunk/PKGBUILD

----------+
 PKGBUILD |   58 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-06 15:56:09 UTC (rev 1378639)
+++ PKGBUILD    2023-01-06 15:58:30 UTC (rev 1378640)
@@ -7,7 +7,7 @@
 _chromiumver=106.0.5249.199
 _gcc_patchset=2
 # shellcheck disable=SC2034
-pkgrel=2
+pkgrel=3
 
 _major_ver=${pkgver%%.*}
 if [[ ${_use_suffix} != 0 ]]; then
@@ -115,29 +115,31 @@
     sed -i "s|@ELECTRON_NAME@|Electron|" electron.desktop
   fi
 
-  export PATH="${PATH}:${srcdir:?}/depot_tools"
-
-  echo "Fetching chromium..."
-  git clone --branch=${_chromiumver} --depth=1 \
-      https://chromium.googlesource.com/chromium/src.git
-
-  echo "solutions = [
+cat >.gclient <<EOF
+solutions = [
   {
-    \"name\": \"src/electron\",
-    \"url\": \"file://${srcdir}/electron@${_commit}\",
-    \"deps_file\": \"DEPS\",
-    \"managed\": False,
-    \"custom_deps\": {
-      \"src\": None,
+    "name": "src/electron",
+    "url": "file://${srcdir}/electron@${_commit}",
+    "deps_file": "DEPS",
+    "managed": False,
+    "custom_deps": {
+      "src": None,
     },
-    \"custom_vars\": {},
+    "custom_vars": {},
   },
-]" > .gclient
+]
+EOF
 
-  python "${srcdir}/depot_tools/gclient.py" sync \
+  export PATH+=":$PWD/depot_tools" DEPOT_TOOLS_UPDATE=0
+  export VPYTHON_BYPASS='manually managed python not supported by chrome 
operations'
+
+  echo "Fetching chromium..."
+  git clone -b ${_chromiumver} --depth=2 
https://chromium.googlesource.com/chromium/src
+
+  depot_tools/gclient.py sync -D \
+      --nohooks \
       --with_branch_heads \
-      --with_tags \
-      --nohooks
+      --with_tags
 
   (
     cd src/electron || exit
@@ -154,23 +156,15 @@
     -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
   src/build/util/lastchange.py \
     -s src/third_party/dawn --revision src/gpu/webgpu/DAWN_VERSION
+  src/tools/update_pgo_profiles.py --target=linux update \
+    --gs-url-base=chromium-optimization-profiles/pgo_profiles
+  depot_tools/download_from_google_storage.py --no_resume --extract --no_auth \
+    --bucket chromium-nodejs -s src/third_party/node/node_modules.tar.gz.sha1
   # Create sysmlink to system clang-format
   ln -s /usr/bin/clang-format src/buildtools/linux64
   # Create sysmlink to system Node.js
   mkdir -p src/third_party/node/linux/node-linux-x64/bin
   ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin
-  src/third_party/depot_tools/download_from_google_storage.py \
-    --no_resume --extract --no_auth --bucket chromium-nodejs \
-    -s src/third_party/node/node_modules.tar.gz.sha1
-  python src/tools/download_optimization_profile.py \
-    --newest_state=src/chrome/android/profiles/newest.txt \
-    --local_state=src/chrome/android/profiles/local.txt \
-    --output_name=src/chrome/android/profiles/afdo.prof \
-    --gs_url_base=chromeos-prebuilt/afdo-job/llvm
-  #vpython src/tools/update_pgo_profiles.py \
-  #  --target=linux \
-  #  update \
-  #  --gs-url-base=chromium-optimization-profiles/pgo_profiles
   src/electron/script/apply_all_patches.py \
       src/electron/patches/config.json
   cd src/electron || exit
@@ -273,7 +267,7 @@
     host_toolchain = "//build/toolchain/linux/unbundle:default"
     clang_use_chrome_plugins = false
     symbol_level = 0
-    chrome_pgo_phase = 0
+    chrome_pgo_phase = 2
     treat_warnings_as_errors = false
     rtc_use_pipewire = true
     link_pulseaudio = true

Reply via email to