Skip to content

Commit c3a84cc

Browse files
chromium: Update to 123.0.6312.122 (#806)
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 <[email protected]>
1 parent 68d56d5 commit c3a84cc

19 files changed

+46
-122
lines changed

meta-chromium/conf/layer.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/"
99
BBFILE_PRIORITY_chromium-browser-layer = "7"
1010

1111
LAYERVERSION_chromium-browser-layer = "1"
12-
LAYERSERIES_COMPAT_chromium-browser-layer = "nanbield scarthgap"
12+
LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap"
1313

1414
LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"

meta-chromium/recipes-browser/chromium/chromium-gn.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ B = "${S}/${OUTPUT_DIR}"
1212

1313
# Backported patches.
1414
SRC_URI += "\
15-
file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
1615
file://backport/Add-missing-components-enterprise-buildflag.patch \
1716
"
17+
1818
# Non-specific patches.
1919
SRC_URI += "\
2020
file://0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch \

meta-chromium/recipes-browser/chromium/chromium.inc

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[sha256sum] = "51757e7ecf5bb1db4881562d021547be5f8065e4f22a6ba9bf6e9a3a0d32c2ea"
7+
SRC_URI[sha256sum] = "c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885"
88

99
S = "${WORKDIR}/chromium-${PV}"
1010

@@ -128,7 +128,7 @@ LIC_FILES_CHKSUM = "\
128128
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \
129129
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \
130130
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \
131-
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=ccf2e51a4d2e697e200e15c6a5b3dc43 \
131+
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \
132132
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \
133133
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cast/LICENSE;md5=1e61529f08860f8fa1c90bf8af8007ff \
134134
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 = "\
143143
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
144144
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_stats/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
145145
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \
146+
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_impl/LICENSE;md5=b3ff0b3c1f1ae4bfec52d02f9ebee09b \
147+
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_java/LICENSE;md5=2748ed5b9bbbde8a6dcec3d59a1a88a1 \
146148
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
147149
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
148150
file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
@@ -180,11 +182,15 @@ LIC_FILES_CHKSUM = "\
180182
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \
181183
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_util/LICENSE;md5=87abbc18e66acb445c00810347051776 \
182184
file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
185+
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
186+
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
183187
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
184188
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
189+
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
185190
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
186191
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
187192
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
193+
file://${S}/third_party/android_deps/libs/org_tensorflow_tensorflow_lite_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
188194
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
189195
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
190196
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -216,7 +222,6 @@ LIC_FILES_CHKSUM = "\
216222
file://${S}/third_party/cardboard/LICENSE;md5=3446ed11f63049b8f1e60e833dcdc5b7 \
217223
file://${S}/third_party/cast_core/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
218224
file://${S}/third_party/catapult/experimental/trace_on_tap/third_party/pako/LICENSE;md5=6b8c8aad0a85200097ec8f989636baf0 \
219-
file://${S}/third_party/catapult/third_party/Paste/docs/license.txt;md5=1798f29d55080c60365e6283cb49779c \
220225
file://${S}/third_party/catapult/third_party/WebOb/docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5 \
221226
file://${S}/third_party/catapult/third_party/apiclient/LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3 \
222227
file://${S}/third_party/catapult/third_party/cachetools/LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5 \
@@ -403,7 +408,6 @@ LIC_FILES_CHKSUM = "\
403408
file://${S}/third_party/rjsmin/LICENSE;md5=34f8c1142fd6208a8be89399cb521df9 \
404409
file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \
405410
file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
406-
file://${S}/third_party/screen-ai/LICENSE;md5=fb0a45fc2d5c3c92cf3e5c8e19e0e758 \
407411
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
408412
file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
409413
file://${S}/third_party/selenium-atoms/LICENSE.closure;md5=e23fadd6ceef8c618fc1c65191d846fa \

meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Rebased-by: Randy MacLeod <[email protected]>
2121
1 file changed, 38 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index 89b4755..f7ba313 100644
24+
index 3c7b4d8..19ea87a 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
2727
@@ -1174,11 +1174,6 @@ config("compiler_cpu_abi") {

meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Maksim Sisov <[email protected]>
1717
2 files changed, 5 insertions(+)
1818

1919
diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
20-
index 52504f4..40425d6 100644
20+
index 6b38d3f..7771a69 100644
2121
--- a/tools/v8_context_snapshot/BUILD.gn
2222
+++ b/tools/v8_context_snapshot/BUILD.gn
2323
@@ -44,6 +44,7 @@ if (use_v8_context_snapshot) {
@@ -29,34 +29,34 @@ index 52504f4..40425d6 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index bc087fd..f5b0f48 100644
32+
index a28da02..c32fd9e 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2169,6 +2169,7 @@ template("run_torque") {
35+
@@ -2181,6 +2181,7 @@ template("run_torque") {
3636
}
3737

3838
args = [
3939
+ "./v8-qemu-wrapper.sh",
4040
"./" + rebase_path(
4141
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4242
root_build_dir),
43-
@@ -2326,6 +2327,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2338,6 +2339,7 @@ action("generate_bytecode_builtins_list") {
4444
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4545
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4646
args = [
4747
+ "./v8-qemu-wrapper.sh",
4848
"./" + rebase_path(
4949
get_label_info(
5050
":bytecode_builtins_list_generator($v8_generator_toolchain)",
51-
@@ -2365,6 +2367,7 @@ template("run_mksnapshot") {
51+
@@ -2377,6 +2379,7 @@ template("run_mksnapshot") {
5252
data = []
5353

5454
args = [
5555
+ "./v8-qemu-wrapper.sh",
5656
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5757
"root_out_dir") + "/mksnapshot",
5858
root_build_dir),
59-
@@ -7134,6 +7137,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7165,6 +7168,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index f7ba313..ce7b6dd 100644
16+
index 19ea87a..e923392 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1818,6 +1818,11 @@ config("default_warnings") {
19+
@@ -1821,6 +1821,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index c00c41b..7d32eb4 100644
21+
index a989a35..a94c7de 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1118,7 +1118,9 @@ component("base") {
24+
@@ -1126,7 +1126,9 @@ component("base") {
2525
# Needed for <atomic> if using newer C++ library than sysroot, except if
2626
# building inside the cros_sdk environment - use host_toolchain as a
2727
# more robust check for this.

meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1717
1 file changed, 18 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index ce7b6dd..028ba52 100644
20+
index e923392..41b5a94 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -618,24 +618,6 @@ config("compiler") {
23+
@@ -613,24 +613,6 @@ config("compiler") {
2424
}
2525
}
2626

meta-chromium/recipes-browser/chromium/files/0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1414
1 file changed, 2 insertions(+), 2 deletions(-)
1515

1616
diff --git a/components/autofill/core/browser/data_model/autofill_i18n_api.h b/components/autofill/core/browser/data_model/autofill_i18n_api.h
17-
index fa57762..f2bd0d0 100644
17+
index cc7d0d3..01dcf44 100644
1818
--- a/components/autofill/core/browser/data_model/autofill_i18n_api.h
1919
+++ b/components/autofill/core/browser/data_model/autofill_i18n_api.h
2020
@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definition {

meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
2121
1 file changed, 5 insertions(+), 4 deletions(-)
2222

2323
diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
24-
index d3054d1..bdc13fb 100644
24+
index 5f17171..d90a7e0 100644
2525
--- a/build/config/clang/BUILD.gn
2626
+++ b/build/config/clang/BUILD.gn
27-
@@ -121,14 +121,15 @@ template("clang_lib") {
27+
@@ -147,14 +147,15 @@ template("clang_lib") {
2828
} else if (is_apple) {
2929
_dir = "darwin"
3030
} else if (is_linux || is_chromeos) {

meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch

+11-23
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ Subject: [PATCH] Adjust the Rust build to our needs
1616
Upstream-Status: Inappropriate [specific to our build setup]
1717
Signed-off-by: Max Ihlenfeldt <[email protected]>
1818
---
19-
build/config/rust.gni | 24 +++++++++++++++++------
19+
build/config/rust.gni | 24 ++++++++++++++++++------
2020
build/rust/rustc_wrapper.py | 1 +
21-
build/rust/std/BUILD.gn | 33 ++++++++++++++++++++++++--------
21+
build/rust/std/BUILD.gn | 28 +++++++++++++++++++++-------
2222
build/rust/std/find_std_rlibs.py | 16 +++++++++++-----
23-
4 files changed, 55 insertions(+), 19 deletions(-)
23+
4 files changed, 51 insertions(+), 18 deletions(-)
2424

2525
diff --git a/build/config/rust.gni b/build/config/rust.gni
26-
index e98d913..6213b72 100644
26+
index 9b0ee75..b2866b3 100644
2727
--- a/build/config/rust.gni
2828
+++ b/build/config/rust.gni
29-
@@ -87,6 +87,11 @@ declare_args() {
29+
@@ -98,6 +98,11 @@ declare_args() {
3030
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
3131
# escape sequences but it's not reliable in general.
3232
force_rustc_color_output = false
@@ -91,10 +91,10 @@ index b8e490d..d22cf08 100755
9191
abs_build_root = os.getcwd().replace('\\', '/') + '/'
9292
is_windows = sys.platform == 'win32' or args.target_windows
9393
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
94-
index 77f4b8c..8a25798 100644
94+
index 9c3db1e..6d9b684 100644
9595
--- a/build/rust/std/BUILD.gn
9696
+++ b/build/rust/std/BUILD.gn
97-
@@ -188,7 +188,8 @@ if (toolchain_has_rust) {
97+
@@ -178,7 +178,8 @@ if (toolchain_has_rust) {
9898
# our locally-built std. Both reside in root_out_dir: we must only have one of
9999
# each per GN toolchain anyway.
100100

@@ -104,7 +104,7 @@ index 77f4b8c..8a25798 100644
104104

105105
if (!rust_prebuilt_stdlib) {
106106
local_rustc_sysroot = "$root_out_dir/local_rustc_sysroot"
107-
@@ -372,12 +373,12 @@ if (toolchain_has_rust) {
107+
@@ -358,12 +359,12 @@ if (toolchain_has_rust) {
108108
rust_abi_target,
109109
]
110110

@@ -120,7 +120,7 @@ index 77f4b8c..8a25798 100644
120120
}
121121

122122
visibility = [ ":*" ]
123-
@@ -390,8 +391,18 @@ if (toolchain_has_rust) {
123+
@@ -376,8 +377,18 @@ if (toolchain_has_rust) {
124124
"enable_rust=false")
125125
deps = [ ":find_stdlib" ]
126126
sources = get_target_outputs(":find_stdlib")
@@ -141,19 +141,7 @@ index 77f4b8c..8a25798 100644
141141

142142
visibility = [ ":*" ]
143143
}
144-
@@ -429,7 +440,10 @@ if (toolchain_has_rust) {
145-
# Use the sysroot generated by :prebuilt_rustc_copy_to_sysroot.
146-
group("stdlib_for_rustc") {
147-
all_dependent_configs = [ ":prebuilt_stdlib_sysroot" ]
148-
- deps = [ ":prebuilt_rustc_copy_to_sysroot" ]
149-
+ deps = [
150-
+ ":prebuilt_rustc_copy_to_sysroot",
151-
+ ":prebuilt_rustc_copy_target_json_to_sysroot",
152-
+ ]
153-
}
154-
155-
# Links the Rust stdlib. Used by targets for which linking is driven by
156-
@@ -439,7 +453,10 @@ if (toolchain_has_rust) {
144+
@@ -417,7 +428,10 @@ if (toolchain_has_rust) {
157145
":prebuilt_stdlib_libs",
158146
":stdlib_public_dependent_libs",
159147
]
@@ -166,7 +154,7 @@ index 77f4b8c..8a25798 100644
166154
# The host builds tools toolchain supports Rust only and does not use
167155
# the allocator remapping to point it to PartitionAlloc.
168156
diff --git a/build/rust/std/find_std_rlibs.py b/build/rust/std/find_std_rlibs.py
169-
index 386258f..3bb6a41 100755
157+
index 386258f..e8fdaa9 100755
170158
--- a/build/rust/std/find_std_rlibs.py
171159
+++ b/build/rust/std/find_std_rlibs.py
172160
@@ -17,7 +17,7 @@ import re

meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1414
1 file changed, 1 deletion(-)
1515

1616
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
17-
index 8a25798..2d284e6 100644
17+
index 9c3db1e..8824200 100644
1818
--- a/build/rust/std/BUILD.gn
1919
+++ b/build/rust/std/BUILD.gn
20-
@@ -100,7 +100,6 @@ if (toolchain_has_rust) {
20+
@@ -90,7 +90,6 @@ if (toolchain_has_rust) {
2121
# don't need to pass to the C++ linker because they're used for specialized
2222
# purposes.
2323
skip_stdlib_files = [

meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <[email protected]>
1919
1 file changed, 10 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index 028ba52..f18ea0a 100644
22+
index 41b5a94..2314d18 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
2525
@@ -1155,16 +1155,6 @@ config("compiler_cpu_abi") {

meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <[email protected]>
1515
1 file changed, 1 insertion(+), 1 deletion(-)
1616

1717
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
18-
index e342a39..1410489 100644
18+
index 5691d26..b590c09 100644
1919
--- a/third_party/boringssl/BUILD.gn
2020
+++ b/third_party/boringssl/BUILD.gn
21-
@@ -113,7 +113,7 @@ if (enable_rust_boringssl) {
21+
@@ -109,7 +109,7 @@ if (enable_rust_boringssl) {
2222
}
2323
}
2424

meta-chromium/recipes-browser/chromium/files/backport/Add-missing-components-enterprise-buildflag.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1717
3 files changed, 3 insertions(+)
1818

1919
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
20-
index 159ee09..fee4c31 100644
20+
index 47aad96..6833680 100644
2121
--- a/chrome/browser/devtools/BUILD.gn
2222
+++ b/chrome/browser/devtools/BUILD.gn
2323
@@ -113,6 +113,7 @@ static_library("devtools") {
@@ -29,10 +29,10 @@ index 159ee09..fee4c31 100644
2929
"//content/public/browser",
3030
"//net",
3131
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
32-
index 0ca4995..554cc16 100644
32+
index 2f5e88a..4b5bfff 100644
3333
--- a/chrome/browser/extensions/BUILD.gn
3434
+++ b/chrome/browser/extensions/BUILD.gn
35-
@@ -853,6 +853,7 @@ static_library("extensions") {
35+
@@ -854,6 +854,7 @@ static_library("extensions") {
3636
"//components/embedder_support",
3737
"//components/embedder_support:browser_util",
3838
"//components/enterprise",
@@ -41,7 +41,7 @@ index 0ca4995..554cc16 100644
4141
"//components/feedback",
4242
"//components/gcm_driver",
4343
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
44-
index 4a67fbf..031e76b 100644
44+
index df78bff..52848f3 100644
4545
--- a/chrome/browser/safe_browsing/BUILD.gn
4646
+++ b/chrome/browser/safe_browsing/BUILD.gn
4747
@@ -31,6 +31,7 @@ static_library("safe_browsing") {

0 commit comments

Comments
 (0)