chromium: Update to 123.0.6312.122 (#806)

MaxIhlenfeldt · web-flow · commit c3a84cceda37 · 2024-05-22T12:21:59.000+02:00
Fixes #796. Note that this PR drops support for Nanbield (which is scheduled to reach its EOL this month anyway), see the discussion at #796 for why. Release notes: https://chromereleases.googleblog.com/2024/03/stable-channel-update-for-desktop_19.html https://chromereleases.googleblog.com/2024/03/stable-channel-update-for-desktop_26.html https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_10.html Build and patch changes: ------------------------ Drop one backported patch that is included upstream now. Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/android_deps/libs/com_google_android_gms_play_services_tflite_impl/LICENSE, third_party/android_deps/libs/com_google_android_gms_play_services_tflite_java/LICENSE, third_party/android_deps/libs/org_tensorflow_tensorflow_lite_api/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5288046 * third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime/LICENSE, third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5260026 * third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5237443 Removed licenses: * third_party/catapult/third_party/Paste/docs/license.txt - https://chromium-review.googlesource.com/c/catapult/+/5288589 * third_party/screen-ai/LICENSE - Not sure why. Updated licenses: * third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5288046 Test-built (big thanks to @rjanani-p): -------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - scarthgap, clang, MACHINE=qemuarm64 * chromium-x11: - master, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 Signed-off-by: Max Ihlenfeldt <max@igalia.com>
diff --git a/meta-chromium/conf/layer.conf b/meta-chromium/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_chromium-browser-layer = "7"
 
 LAYERVERSION_chromium-browser-layer = "1"
-LAYERSERIES_COMPAT_chromium-browser-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap"
 
 LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"
diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc
@@ -12,9 +12,9 @@ B = "${S}/${OUTPUT_DIR}"
 
 # Backported patches.
 SRC_URI += "\
-    file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
     file://backport/Add-missing-components-enterprise-buildflag.patch \
 "
+
 # Non-specific patches.
 SRC_URI += "\
     file://0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch \
diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_123.0.6312.122.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_123.0.6312.122.bb
diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_123.0.6312.122.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_123.0.6312.122.bb
diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
 CVE_PRODUCT = "chromium:chromium google:chrome"
 
 SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
-SRC_URI[sha256sum] = "51757e7ecf5bb1db4881562d021547be5f8065e4f22a6ba9bf6e9a3a0d32c2ea"
+SRC_URI[sha256sum] = "c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885"
 
 S = "${WORKDIR}/chromium-${PV}"
 
@@ -128,7 +128,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \
-    file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=ccf2e51a4d2e697e200e15c6a5b3dc43 \
+    file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cast/LICENSE;md5=1e61529f08860f8fa1c90bf8af8007ff \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/LICENSE;md5=6688c3d596b2e35dd1928d1ffdf5a9e2 \
@@ -143,6 +143,8 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_stats/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \
+    file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_impl/LICENSE;md5=b3ff0b3c1f1ae4bfec52d02f9ebee09b \
+    file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_java/LICENSE;md5=2748ed5b9bbbde8a6dcec3d59a1a88a1 \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
     file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
     file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
@@ -180,11 +182,15 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/android_deps/libs/org_checkerframework_checker_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \
     file://${S}/third_party/android_deps/libs/org_checkerframework_checker_util/LICENSE;md5=87abbc18e66acb445c00810347051776 \
     file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
+    file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://${S}/third_party/android_deps/libs/org_tensorflow_tensorflow_lite_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
     file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -216,7 +222,6 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/cardboard/LICENSE;md5=3446ed11f63049b8f1e60e833dcdc5b7 \
     file://${S}/third_party/cast_core/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
     file://${S}/third_party/catapult/experimental/trace_on_tap/third_party/pako/LICENSE;md5=6b8c8aad0a85200097ec8f989636baf0 \
-    file://${S}/third_party/catapult/third_party/Paste/docs/license.txt;md5=1798f29d55080c60365e6283cb49779c \
     file://${S}/third_party/catapult/third_party/WebOb/docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5 \
     file://${S}/third_party/catapult/third_party/apiclient/LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3 \
     file://${S}/third_party/catapult/third_party/cachetools/LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5 \
@@ -403,7 +408,6 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/rjsmin/LICENSE;md5=34f8c1142fd6208a8be89399cb521df9 \
     file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \
     file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-    file://${S}/third_party/screen-ai/LICENSE;md5=fb0a45fc2d5c3c92cf3e5c8e19e0e758 \
     file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
     file://${S}/third_party/selenium-atoms/LICENSE.closure;md5=e23fadd6ceef8c618fc1c65191d846fa \
diff --git a/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch
@@ -21,7 +21,7 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
  1 file changed, 38 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 89b4755..f7ba313 100644
+index 3c7b4d8..19ea87a 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -1174,11 +1174,6 @@ config("compiler_cpu_abi") {
diff --git a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch
@@ -17,7 +17,7 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
  2 files changed, 5 insertions(+)
 
 diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
-index 52504f4..40425d6 100644
+index 6b38d3f..7771a69 100644
 --- a/tools/v8_context_snapshot/BUILD.gn
 +++ b/tools/v8_context_snapshot/BUILD.gn
 @@ -44,6 +44,7 @@ if (use_v8_context_snapshot) {
@@ -29,34 +29,34 @@ index 52504f4..40425d6 100644
                                            "root_out_dir") +
                                 "/v8_context_snapshot_generator",
 diff --git a/v8/BUILD.gn b/v8/BUILD.gn
-index bc087fd..f5b0f48 100644
+index a28da02..c32fd9e 100644
 --- a/v8/BUILD.gn
 +++ b/v8/BUILD.gn
-@@ -2169,6 +2169,7 @@ template("run_torque") {
+@@ -2181,6 +2181,7 @@ template("run_torque") {
      }
 
      args = [
 +      "./v8-qemu-wrapper.sh",
        "./" + rebase_path(
                get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
                root_build_dir),
-@@ -2326,6 +2327,7 @@ action("generate_bytecode_builtins_list") {
+@@ -2338,6 +2339,7 @@ action("generate_bytecode_builtins_list") {
    outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
    deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
    args = [
 +    "./v8-qemu-wrapper.sh",
      "./" + rebase_path(
              get_label_info(
                      ":bytecode_builtins_list_generator($v8_generator_toolchain)",
-@@ -2365,6 +2367,7 @@ template("run_mksnapshot") {
+@@ -2377,6 +2379,7 @@ template("run_mksnapshot") {
      data = []
 
      args = [
 +      "./v8-qemu-wrapper.sh",
        "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
                                          "root_out_dir") + "/mksnapshot",
                           root_build_dir),
-@@ -7134,6 +7137,7 @@ if (v8_enable_i18n_support) {
+@@ -7165,6 +7168,7 @@ if (v8_enable_i18n_support) {
      outputs = [ output_file ]
 
      args = [
diff --git a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index f7ba313..ce7b6dd 100644
+index 19ea87a..e923392 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1818,6 +1818,11 @@ config("default_warnings") {
+@@ -1821,6 +1821,11 @@ config("default_warnings") {
        cflags += [
          "-Wenum-compare-conditional",
 
diff --git a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
  2 files changed, 4 insertions(+)
 
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index c00c41b..7d32eb4 100644
+index a989a35..a94c7de 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1118,7 +1118,9 @@ component("base") {
+@@ -1126,7 +1126,9 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
diff --git a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch
@@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 18 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ce7b6dd..028ba52 100644
+index e923392..41b5a94 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -618,24 +618,6 @@ config("compiler") {
+@@ -613,24 +613,6 @@ config("compiler") {
        }
      }
 
diff --git a/meta-chromium/recipes-browser/chromium/files/0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch b/meta-chromium/recipes-browser/chromium/files/0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/components/autofill/core/browser/data_model/autofill_i18n_api.h b/components/autofill/core/browser/data_model/autofill_i18n_api.h
-index fa57762..f2bd0d0 100644
+index cc7d0d3..01dcf44 100644
 --- a/components/autofill/core/browser/data_model/autofill_i18n_api.h
 +++ b/components/autofill/core/browser/data_model/autofill_i18n_api.h
 @@ -16,8 +16,8 @@ namespace autofill::i18n_model_definition {
diff --git a/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch b/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch
@@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
-index d3054d1..bdc13fb 100644
+index 5f17171..d90a7e0 100644
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -121,14 +121,15 @@ template("clang_lib") {
+@@ -147,14 +147,15 @@ template("clang_lib") {
        } else if (is_apple) {
          _dir = "darwin"
        } else if (is_linux || is_chromeos) {
diff --git a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch
@@ -16,17 +16,17 @@ Subject: [PATCH] Adjust the Rust build to our needs
 Upstream-Status: Inappropriate [specific to our build setup]
 Signed-off-by: Max Ihlenfeldt <max@igalia.com>
 ---
- build/config/rust.gni            | 24 +++++++++++++++++------
+ build/config/rust.gni            | 24 ++++++++++++++++++------
  build/rust/rustc_wrapper.py      |  1 +
- build/rust/std/BUILD.gn          | 33 ++++++++++++++++++++++++--------
+ build/rust/std/BUILD.gn          | 28 +++++++++++++++++++++-------
  build/rust/std/find_std_rlibs.py | 16 +++++++++++-----
- 4 files changed, 55 insertions(+), 19 deletions(-)
+ 4 files changed, 51 insertions(+), 18 deletions(-)
 
 diff --git a/build/config/rust.gni b/build/config/rust.gni
-index e98d913..6213b72 100644
+index 9b0ee75..b2866b3 100644
 --- a/build/config/rust.gni
 +++ b/build/config/rust.gni
-@@ -87,6 +87,11 @@ declare_args() {
+@@ -98,6 +98,11 @@ declare_args() {
    # a platform. Mostly applicable to Windows, where new versions can handle ANSI
    # escape sequences but it's not reliable in general.
    force_rustc_color_output = false
@@ -91,10 +91,10 @@ index b8e490d..d22cf08 100755
    abs_build_root = os.getcwd().replace('\\', '/') + '/'
    is_windows = sys.platform == 'win32' or args.target_windows
 diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
-index 77f4b8c..8a25798 100644
+index 9c3db1e..6d9b684 100644
 --- a/build/rust/std/BUILD.gn
 +++ b/build/rust/std/BUILD.gn
-@@ -188,7 +188,8 @@ if (toolchain_has_rust) {
+@@ -178,7 +178,8 @@ if (toolchain_has_rust) {
    # our locally-built std. Both reside in root_out_dir: we must only have one of
    # each per GN toolchain anyway.
 
@@ -104,7 +104,7 @@ index 77f4b8c..8a25798 100644
 
    if (!rust_prebuilt_stdlib) {
      local_rustc_sysroot = "$root_out_dir/local_rustc_sysroot"
-@@ -372,12 +373,12 @@ if (toolchain_has_rust) {
+@@ -358,12 +359,12 @@ if (toolchain_has_rust) {
          rust_abi_target,
        ]
 
@@ -120,7 +120,7 @@ index 77f4b8c..8a25798 100644
        }
 
        visibility = [ ":*" ]
-@@ -390,8 +391,18 @@ if (toolchain_has_rust) {
+@@ -376,8 +377,18 @@ if (toolchain_has_rust) {
                   "enable_rust=false")
        deps = [ ":find_stdlib" ]
        sources = get_target_outputs(":find_stdlib")
@@ -141,19 +141,7 @@ index 77f4b8c..8a25798 100644
 
        visibility = [ ":*" ]
      }
-@@ -429,7 +440,10 @@ if (toolchain_has_rust) {
-     # Use the sysroot generated by :prebuilt_rustc_copy_to_sysroot.
-     group("stdlib_for_rustc") {
-       all_dependent_configs = [ ":prebuilt_stdlib_sysroot" ]
--      deps = [ ":prebuilt_rustc_copy_to_sysroot" ]
-+      deps = [
-+        ":prebuilt_rustc_copy_to_sysroot",
-+        ":prebuilt_rustc_copy_target_json_to_sysroot",
-+      ]
-     }
-
-     # Links the Rust stdlib. Used by targets for which linking is driven by
-@@ -439,7 +453,10 @@ if (toolchain_has_rust) {
+@@ -417,7 +428,10 @@ if (toolchain_has_rust) {
          ":prebuilt_stdlib_libs",
          ":stdlib_public_dependent_libs",
        ]
@@ -166,7 +154,7 @@ index 77f4b8c..8a25798 100644
        # The host builds tools toolchain supports Rust only and does not use
        # the allocator remapping to point it to PartitionAlloc.
 diff --git a/build/rust/std/find_std_rlibs.py b/build/rust/std/find_std_rlibs.py
-index 386258f..3bb6a41 100755
+index 386258f..e8fdaa9 100755
 --- a/build/rust/std/find_std_rlibs.py
 +++ b/build/rust/std/find_std_rlibs.py
 @@ -17,7 +17,7 @@ import re
diff --git a/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch b/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch
@@ -14,10 +14,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
-index 8a25798..2d284e6 100644
+index 9c3db1e..8824200 100644
 --- a/build/rust/std/BUILD.gn
 +++ b/build/rust/std/BUILD.gn
-@@ -100,7 +100,6 @@ if (toolchain_has_rust) {
+@@ -90,7 +90,6 @@ if (toolchain_has_rust) {
    # don't need to pass to the C++ linker because they're used for specialized
    # purposes.
    skip_stdlib_files = [
diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch b/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 10 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 028ba52..f18ea0a 100644
+index 41b5a94..2314d18 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -1155,16 +1155,6 @@ config("compiler_cpu_abi") {
diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch b/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index e342a39..1410489 100644
+index 5691d26..b590c09 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
-@@ -113,7 +113,7 @@ if (enable_rust_boringssl) {
+@@ -109,7 +109,7 @@ if (enable_rust_boringssl) {
    }
  }
 
diff --git a/meta-chromium/recipes-browser/chromium/files/backport/Add-missing-components-enterprise-buildflag.patch b/meta-chromium/recipes-browser/chromium/files/backport/Add-missing-components-enterprise-buildflag.patch
@@ -17,7 +17,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  3 files changed, 3 insertions(+)
 
 diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
-index 159ee09..fee4c31 100644
+index 47aad96..6833680 100644
 --- a/chrome/browser/devtools/BUILD.gn
 +++ b/chrome/browser/devtools/BUILD.gn
 @@ -113,6 +113,7 @@ static_library("devtools") {
@@ -29,10 +29,10 @@ index 159ee09..fee4c31 100644
      "//content/public/browser",
      "//net",
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 0ca4995..554cc16 100644
+index 2f5e88a..4b5bfff 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -853,6 +853,7 @@ static_library("extensions") {
+@@ -854,6 +854,7 @@ static_library("extensions") {
      "//components/embedder_support",
      "//components/embedder_support:browser_util",
      "//components/enterprise",
@@ -41,7 +41,7 @@ index 0ca4995..554cc16 100644
      "//components/feedback",
      "//components/gcm_driver",
 diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
-index 4a67fbf..031e76b 100644
+index df78bff..52848f3 100644
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
 @@ -31,6 +31,7 @@ static_library("safe_browsing") {
diff --git a/meta-chromium/recipes-browser/chromium/files/backport/Make-toolchain_supports_rust_thin_lto-configurable.patch b/meta-chromium/recipes-browser/chromium/files/backport/Make-toolchain_supports_rust_thin_lto-configurable.patch
diff --git a/meta-chromium/recipes-browser/chromium/gn-native_123.0.6312.122.bb b/meta-chromium/recipes-browser/chromium/gn-native_123.0.6312.122.bb

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>`
`17`	`17`	`1 file changed, 18 deletions(-)`
`18`	`18`
`19`	`19`	`diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn`
`20`		`-index ce7b6dd..028ba52 100644`
	`20`	`+index e923392..41b5a94 100644`
`21`	`21`	`--- a/build/config/compiler/BUILD.gn`
`22`	`22`	`+++ b/build/config/compiler/BUILD.gn`
`23`		`-@@ -618,24 +618,6 @@ config("compiler") {`
	`23`	`+@@ -613,24 +613,6 @@ config("compiler") {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`