Update to 92.0.4515.159

.build_config

@@ -10,7 +10,7 @@ trichrome_webview_target=trichrome_webview_apk
 trichrome_webview_64_target=trichrome_webview_64_apk
 all=all
 
-chromium_version=92.0.4515.131
-ungoogled_chromium_version=92.0.4515.131
+chromium_version=92.0.4515.159
+ungoogled_chromium_version=92.0.4515.159
 ungoogled_chromium_revision=1
 ungoogled_chromium_android_revision=1

.gclient

@@ -49,9 +49,7 @@ solutions = [
  "src/chrome/test/data/perf/frame_rate/content": None,
  "src/chrome/test/data/xr/webvr_info": None,
  "src/chrome/test/data/xr/webxr_samples": None,
- "src/third_party/spirv-cross/spirv-cross": None,
  "src/third_party/shaderc/src": None,
- "src/third_party/dav1d/libdav1d": None,
  "src/third_party/glfw/src": None,
  "src/third_party/devtools-node-modules": None,
  "src/third_party/hunspell_dictionaries": None,
@@ -66,8 +64,6 @@ solutions = [
  "src/third_party/visualmetrics/src": None,
  "src/third_party/webdriver/pylib": None,
  "src/third_party/webgl/src": None,
- "src/third_party/webrtc": None,
- "src/tools/page_cycler/acid3": None,
  "src/tools/swarming_client": None,
  "src/third_party/elfutils/src": None,
  "src/third_party/android_tools": None,

build.sh

@@ -110,7 +110,7 @@ function prepare_repos {
  rm -rf "$dname"
  fi
  done
- 
+
  path_modified=false
  patch_applied=false
 
@@ -143,15 +143,6 @@ function prepare_repos {
  gclient.py sync --nohooks --no-history --shallow --revision=${chromium_version} || return $?
 
  ## Fix repos
- webrtc_commit=$(grep 'webrtc_git.*/src\.git' src/DEPS | cut -d\' -f8)
- mkdir src/third_party/webrtc
- pushd src/third_party/webrtc
- git init
- git remote add origin https://webrtc.googlesource.com/src.git
- git fetch --depth 1 --no-tags origin "${webrtc_commit}" || return $?
- git reset --hard FETCH_HEAD
- popd
-
  libsync_commit=$(grep 'libsync\.git' src/DEPS | cut -d\' -f10)
  mkdir src/third_party/libsync/src
  pushd src/third_party/libsync/src
@@ -170,15 +161,6 @@ function prepare_repos {
  git reset --hard FETCH_HEAD
  popd
 
- libdav1d_commit=$(grep 'dav1d\.git' src/DEPS | cut -d\' -f8)
- mkdir src/third_party/dav1d/libdav1d
- pushd src/third_party/dav1d/libdav1d
- git init
- git remote add origin https://chromium.googlesource.com/external/github.com/videolan/dav1d.git
- git fetch --depth 1 --no-tags origin "${libdav1d_commit}" || return $?
- git reset --hard FETCH_HEAD
- popd
-
  # update node
  mkdir -p src/third_party/node/linux/node-linux-x64/bin
  ln -s /usr/bin/node src/third_party/node/linux/node-linux-x64/bin/
@@ -295,10 +277,6 @@ for i in $(seq 1 5); do ./build.sh && s=0 && break || s=$? && sleep 60; done; (e
 popd
 # Some of the support libraries can be grabbed from maven https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/com/android/support/
 
-# chromium-web-store, extension version only
-# git clone https://github.com/NeverDecaf/chromium-web-store
-# cp -ar chromium-web-store/en_nolocale src/chrome/browser/resources/chromium_web_store
-
 # Additional Source Patches
 ## Extra fixes for Chromium source
 python3 ungoogled-chromium/utils/patches.py apply src patches
@@ -350,19 +328,19 @@ if [[ "$TARGET" != "all" ]]; then
  if [[ "$TARGET" == "trichrome_chrome_bundle_target" ]] || [[ "$TARGET" == "chrome_modern_target" ]] || [[ "$TARGET" == "trichrome_chrome_apk_target" ]] || [[ "$TARGET" == "trichrome_webview_target" ]]; then
  ../bundle_generate_apk.sh -o "${output_folder}" -a "${ARCH}" -t "${TARGET_EXPANDED}"
  fi
- find . -iname "*.apk" -exec cp -f {} ../"${apk_out_folder}" \;
+ find ${output_folder}/apks/release -iname "*.apk" -exec cp -f {} ../"${apk_out_folder}" \;
 else
  ninja -C out/Default "$chrome_modern_target"
  ../bundle_generate_apk.sh -o "${output_folder}" -a "${ARCH}" -t "$chrome_modern_target"
  ninja -C out/Default "$webview_target"
  ninja -C out/Default "$trichrome_webview_target"
- find . -iname "*.apk" -exec cp -f {} ../"${apk_out_folder}" \;
+ find ${output_folder}/apks/release -iname "*.apk" -exec cp -f {} ../"${apk_out_folder}" \;
 
  # arm64+TriChrome needs to be run separately, otherwise it will fail
  if [[ "$ARCH" != "arm64" ]]; then
  ninja -C "${output_folder}" "$trichrome_chrome_apk_target"
 # ../bundle_generate_apk.sh -o "${output_folder}" -a "${ARCH}" -t "$trichrome_chrome_bundle_target"
- find . -iname "*.apk" -exec cp -f {} ../"${apk_out_folder}" \;
+ find ${output_folder}/apks/release -iname "*.apk" -exec cp -f {} ../"${apk_out_folder}" \;
  fi
 fi
 popd