Skip to content

Commit 83cb90c

Browse files
chromium: Update to 126.0.6478.126 (#826)
Fixes #823. Release notes: https://chromereleases.googleblog.com/2024/06/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2024/06/stable-channel-update-for-desktop_13.html https://chromereleases.googleblog.com/2024/06/stable-channel-update-for-desktop_18.html https://chromereleases.googleblog.com/2024/06/stable-channel-update-for-desktop_24.html Build and patch changes: ------------------------ Drop two backported patches that are included in upstream now. Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/crabbyavif/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5458147 Removed licenses: * base/third_party/dynamic_annotations/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2544607 * third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5515920 * 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/+/5494530 Updated licenses: * third_party/android_deps/libs/com_google_android_gms_play_services_location/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5515920 * third_party/ffmpeg/CREDITS.chromium - https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+/46a49cb3ec46cf95499c7f265e9d840c16430ac7 * third_party/swiftshader/third_party/SPIRV-Headers/LICENSE - https://swiftshader-review.googlesource.com/c/SwiftShader/+/73371 Test-built (big thanks to @rjanani-p): -------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - scarthgap, clang, MACHINE=qemuarm64, qemux86-64 * chromium-x11: - master, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 - scarthgap, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent 0a182ba commit 83cb90c

15 files changed

+34
-122
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ OUTPUT_DIR = "out/Release"
1111
B = "${S}/${OUTPUT_DIR}"
1212

1313
# Backported patches.
14-
SRC_URI += "\
15-
file://backport/Add-missing-components-enterprise-buildflag.patch \
16-
"
14+
# (none, currently \o/)
1715

1816
# Non-specific patches.
1917
SRC_URI += "\

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

Lines changed: 5 additions & 9 deletions
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] = "9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603"
7+
SRC_URI[sha256sum] = "5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143"
88

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

@@ -66,7 +66,6 @@ LIC_FILES_CHKSUM = "\
6666
file://${S}/base/third_party/cityhash/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
6767
file://${S}/base/third_party/cityhash_v103/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
6868
file://${S}/base/third_party/double_conversion/LICENSE;md5=1ea35644f0ec0d9767897115667e901f \
69-
file://${S}/base/third_party/dynamic_annotations/LICENSE;md5=b6bd7011ecc1a4f7ac3525589f45e565 \
7069
file://${S}/base/third_party/nspr/LICENSE;md5=0806173dfb7e6d060074595e968fd02e \
7170
file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \
7271
file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \
@@ -138,13 +137,10 @@ LIC_FILES_CHKSUM = "\
138137
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
139138
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_iid/LICENSE;md5=05fc50851d6d550ef2bb400b326353f0 \
140139
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/LICENSE;md5=cd033bdb088af16ecdbcd95bd5562a30 \
141-
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_location/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
140+
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_location/LICENSE;md5=6a7afdc2d1780ac0a9bd21bd59640cdf \
142141
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
143-
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
144142
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_stats/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
145143
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 \
148144
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
149145
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
150146
file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
@@ -190,7 +186,6 @@ LIC_FILES_CHKSUM = "\
190186
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
191187
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
192188
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 \
194189
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
195190
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
196191
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -265,6 +260,7 @@ LIC_FILES_CHKSUM = "\
265260
file://${S}/third_party/coremltools/mlmodel/format/LICENSE;md5=646b3097f3a7222ada5b4561c39d52e8 \
266261
file://${S}/third_party/cpu_features/src/LICENSE;md5=31a8379f6fe09baf921e654832ac5700 \
267262
file://${S}/third_party/cpuinfo/src/LICENSE;md5=cabca80e8e4a4bbe90e9a4b4ad53f5f4 \
263+
file://${S}/third_party/crabbyavif/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
268264
file://${S}/third_party/crashpad/crashpad/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
269265
file://${S}/third_party/crashpad/crashpad/third_party/getopt/LICENSE;md5=f7413523e1c0b3a644fd6bbbc33b6296 \
270266
file://${S}/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE;md5=dacaafbaf91483700da837d31213a1e8 \
@@ -302,7 +298,7 @@ LIC_FILES_CHKSUM = "\
302298
file://${S}/third_party/expat/src/expat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb \
303299
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
304300
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
305-
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=a1624152b484ce949c0db957a428ac07 \
301+
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=dbec96c09140718ea111e66592c92e34 \
306302
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
307303
file://${S}/third_party/flac/COPYING.Xiph;md5=3d6da238b5b57a0965d6730291119f65 \
308304
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
@@ -430,7 +426,7 @@ LIC_FILES_CHKSUM = "\
430426
file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \
431427
file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \
432428
file://${S}/third_party/swiftshader/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87 \
433-
file://${S}/third_party/swiftshader/third_party/SPIRV-Headers/LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d \
429+
file://${S}/third_party/swiftshader/third_party/SPIRV-Headers/LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741 \
434430
file://${S}/third_party/swiftshader/third_party/SPIRV-Tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
435431
file://${S}/third_party/tensorflow-text/LICENSE;md5=01e86893010a1b87e69a213faa753ebd \
436432
file://${S}/third_party/tensorflow_models/src/LICENSE;md5=6f798069926aa738ee3bbbcac6c62a2f \

meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1919
1 file changed, 48 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index 973d8bc..f0ffab2 100644
22+
index 6efe967..a5035c0 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1197,27 +1197,6 @@ config("compiler_cpu_abi") {
25+
@@ -1172,27 +1172,6 @@ config("compiler_cpu_abi") {
2626
"-msse3",
2727
]
2828
}
@@ -50,7 +50,7 @@ index 973d8bc..f0ffab2 100644
5050
} else if (current_cpu == "mipsel" && !is_nacl) {
5151
ldflags += [ "-Wl,--hash-style=sysv" ]
5252
if (custom_toolchain == "") {
53-
@@ -1225,9 +1204,6 @@ config("compiler_cpu_abi") {
53+
@@ -1200,9 +1179,6 @@ config("compiler_cpu_abi") {
5454
if (is_android) {
5555
cflags += [ "--target=mipsel-linux-android" ]
5656
ldflags += [ "--target=mipsel-linux-android" ]
@@ -60,7 +60,7 @@ index 973d8bc..f0ffab2 100644
6060
}
6161
} else {
6262
cflags += [ "-EL" ]
63-
@@ -1307,8 +1283,6 @@ config("compiler_cpu_abi") {
63+
@@ -1282,8 +1258,6 @@ config("compiler_cpu_abi") {
6464
ldflags += [ "-Wl,--hash-style=sysv" ]
6565
if (custom_toolchain == "") {
6666
if (is_clang) {
@@ -69,7 +69,7 @@ index 973d8bc..f0ffab2 100644
6969
} else {
7070
cflags += [ "-EB" ]
7171
ldflags += [ "-EB" ]
72-
@@ -1356,9 +1330,6 @@ config("compiler_cpu_abi") {
72+
@@ -1331,9 +1305,6 @@ config("compiler_cpu_abi") {
7373
if (is_android) {
7474
cflags += [ "--target=mips64el-linux-android" ]
7575
ldflags += [ "--target=mips64el-linux-android" ]
@@ -79,7 +79,7 @@ index 973d8bc..f0ffab2 100644
7979
}
8080
} else {
8181
cflags += [
82-
@@ -1416,8 +1387,6 @@ config("compiler_cpu_abi") {
82+
@@ -1391,8 +1362,6 @@ config("compiler_cpu_abi") {
8383
ldflags += [ "-Wl,--hash-style=sysv" ]
8484
if (custom_toolchain == "") {
8585
if (is_clang) {
@@ -88,7 +88,7 @@ index 973d8bc..f0ffab2 100644
8888
} else {
8989
cflags += [
9090
"-EB",
91-
@@ -1580,23 +1549,6 @@ config("compiler_deterministic") {
91+
@@ -1555,23 +1524,6 @@ config("compiler_deterministic") {
9292
}
9393
}
9494
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ 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 6b38d3f..7771a69 100644
20+
index 80d4b3d..5666cdf 100644
2121
--- a/tools/v8_context_snapshot/BUILD.gn
2222
+++ b/tools/v8_context_snapshot/BUILD.gn
23-
@@ -44,6 +44,7 @@ if (use_v8_context_snapshot) {
23+
@@ -45,6 +45,7 @@ if (use_v8_context_snapshot) {
2424
output_path = rebase_path(output_file, root_build_dir)
2525

2626
args = [
@@ -29,34 +29,34 @@ index 6b38d3f..7771a69 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 79b95fb..1e9862d 100644
32+
index c2c11c2..538b69b 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2214,6 +2214,7 @@ template("run_torque") {
35+
@@ -2216,6 +2216,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-
@@ -2371,6 +2372,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2373,6 +2374,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-
@@ -2410,6 +2412,7 @@ template("run_mksnapshot") {
51+
@@ -2412,6 +2414,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-
@@ -7251,6 +7254,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7287,6 +7290,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

Lines changed: 2 additions & 2 deletions
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 973d8bc..0f2b8f6 100644
16+
index a5035c0..220d0da 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1893,6 +1893,11 @@ config("default_warnings") {
19+
@@ -1820,6 +1820,11 @@ config("default_warnings") {
2020
}
2121

2222
cflags += [

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

Lines changed: 2 additions & 2 deletions
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 5dc15da..2b83e1c 100644
21+
index 4c71300..6f9423a 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1141,7 +1141,9 @@ component("base") {
24+
@@ -1142,7 +1142,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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ 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 973d8bc..c0f6a49 100644
20+
index 6efe967..590a2c2 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -610,24 +610,6 @@ config("compiler") {
23+
@@ -568,24 +568,6 @@ config("compiler") {
2424
}
2525
}
2626

27-
- # TODO(crbug.com/1488374): This causes binary size growth and potentially
27+
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
2828
- # other problems.
29-
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
29+
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
3030
- if (default_toolchain != "//build/toolchain/cros:target" &&
3131
- !llvm_android_mainline) {
3232
- cflags += [
@@ -42,6 +42,6 @@ index 973d8bc..c0f6a49 100644
4242
- }
4343
- }
4444
-
45-
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
45+
# TODO(crbug.com/40192287): Investigate why/if this should be needed.
4646
if (is_win) {
4747
cflags += [ "/clang:-ffp-contract=off" ]

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

Lines changed: 2 additions & 2 deletions
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 498b3eb..421c1d7 100644
24+
index 1a3a7e5..df278db 100644
2525
--- a/build/config/clang/BUILD.gn
2626
+++ b/build/config/clang/BUILD.gn
27-
@@ -165,14 +165,15 @@ template("clang_lib") {
27+
@@ -167,14 +167,15 @@ template("clang_lib") {
2828
} else if (is_apple) {
2929
_dir = "darwin"
3030
} else if (is_linux || is_chromeos) {

0 commit comments

Comments
 (0)