Skip to content

Commit eac2b99

Browse files
chromium: update to 120.0.6099.109 (#777)
Release notes: https://chromereleases.googleblog.com/2023/12/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2023/12/stable-channel-update-for-desktop_6.html https://chromereleases.googleblog.com/2023/12/stable-channel-update-for-desktop_12.html Build and patch changes: ------------------------ Drop three backported patches that are included upstream now, and add four new backports. Add more fixes to 0013-Add-missing-typename-s.patch. Rename 0014-Don-t-pass-disable-auto-upgrade-debug-info-to-linker.patch to 0014-Don-t-pass-unknown-LLVM-options.patch and also disable the `split-threshold-for-reg-with-hint` option. Add more fixes to 0017-Avoid-parenthesized-initialization-of-aggregates.patch. Add more fixes to 0018-Fix-constexpr-variable-cannot-have-non-literal-type-.patch. Add 0022-Use-base-ranges-instead-of-std-ranges.patch to fix a build error on older versions of clang (on mickledore, kirkstone, and dunfell). Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/LICENSE - https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/4580488 Removed licenses: * third_party/android_deps/libs/com_google_guava_listenablefuture/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4960997 * third_party/xdg_shared_mime_info/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4974772 Updated licenses: * third_party/dawn/LICENSE - https://dawn-review.googlesource.com/c/dawn/+/155561 * third_party/ffmpeg/CREDITS.chromium - https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+/265b12a2 * third_party/speech-dispatcher/COPYING => third_party/speech-dispatcher/COPYING.LGPL - https://chromium-review.googlesource.com/c/chromium/src/+/4917472 * third_party/vulkan_memory_allocator/LICENSE.txt - https://chromium-review.googlesource.com/c/chromium/src/+/4911597 Test-built (big thanks to @nrpt-m): ----------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - nanbield, clang, MACHINE=qemux86-64 - mickledore, clang, MACHINE=qemuarm64, qemux86-64 - kirkstone, clang, MACHINE=qemux86-64, raspberrypi4-64 - dunfell, clang**, MACHINE=qemux86-64 * chromium-x11 - master, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - nanbield, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - mickledore, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - kirkstone, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - dunfell, clang**, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64*** ** Please note that Chromium requires below set-up when on dunfell branch. - The clang version to be >= 14 and for that, use the latest meta-clang/dunfell-clang14 branch. - Require the latest meta-oe with Nodejs 14.x support. - Add the PREFERRED_VERSION_nodejs-native = "14.%" in conf/local.conf file. *** Please note that there currently is a problem on RPi4/dunfell where Chromium crashes because of an illegal instruction error. Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 parent bc8caee commit eac2b99

File tree

34 files changed

+1155
-1776
lines changed

34 files changed

+1155
-1776
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ B = "${S}/${OUTPUT_DIR}"
1414
SRC_URI += "\
1515
file://backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch \
1616
file://backport/IWYU-for-net-filter-zstd_source_stream.cc.patch \
17-
file://backport/Replace-std-ranges-which-is-banned-c-20-fea.patch \
1817
file://backport/IWYU-for-components-user_education-common-p.patch \
19-
file://backport/MiracleParameter-Improve-MiracleParameter-s.patch \
20-
file://backport/Replace-std-ranges-with-base-ranges.patch \
2118
file://backport/atspi-mark-possibly-unused-gn-variables.patch \
19+
file://backport/Revert-recent-C-20-usage-in-CFX_FillRenderO.patch \
20+
file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \
21+
file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \
22+
file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \
2223
"
2324
# Non-specific patches.
2425
SRC_URI += "\
@@ -35,14 +36,15 @@ SRC_URI += "\
3536
file://0011-Only-default-operator-on-declaration.patch \
3637
file://0012-Revert-__attribute__-and-alignas-changes.patch \
3738
file://0013-Add-missing-typename-s.patch \
38-
file://0014-Don-t-pass-disable-auto-upgrade-debug-info-to-linker.patch \
39+
file://0014-Don-t-pass-unknown-LLVM-options.patch \
3940
file://0015-Avoid-capturing-structured-bindings.patch \
4041
file://0016-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch \
4142
file://0017-Avoid-parenthesized-initialization-of-aggregates.patch \
4243
file://0018-Fix-constexpr-variable-cannot-have-non-literal-type-.patch \
4344
file://0019-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch \
4445
file://0020-Fix-implicitly-deleted-default-constructor-build-err.patch \
4546
file://0021-Don-t-delete-CrashKeyWithName-dtor.patch \
47+
file://0022-Use-base-ranges-instead-of-std-ranges.patch \
4648
"
4749
# ARM/AArch64-specific patches.
4850
SRC_URI:append:arm = "\

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

Lines changed: 7 additions & 8 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] = "b1ae62beb7907d99802b74821d5198bd54a7456df1116d317da653bde8ce6388"
7+
SRC_URI[sha256sum] = "87c00c525ee07c2233b78dbece1496b697f686244a67fac2c71e4a30bd96849b"
88

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

@@ -62,7 +62,7 @@ LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-2.1-or-later"
6262
LIC_FILES_CHKSUM = "\
6363
file://${S}/LICENSE;md5=c408a301e3407c3803499ce9290515d6 \
6464
file://${S}/LICENSE.chromium_os;md5=775979d3e1e3bf163e4882e231727de5 \
65-
file://${S}/base/allocator/partition_allocator/third_party/apple_apsl/LICENSE;md5=c8c14a9f985552dba8d3edbd76660088 \
65+
file://${S}/base/allocator/partition_allocator/src/partition_alloc/third_party/apple_apsl/LICENSE;md5=c8c14a9f985552dba8d3edbd76660088 \
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 \
@@ -168,7 +168,6 @@ LIC_FILES_CHKSUM = "\
168168
file://${S}/third_party/android_deps/libs/com_google_firebase_firebase_messaging/LICENSE;md5=6287e01249a45d9de9bc62ca9163c913 \
169169
file://${S}/third_party/android_deps/libs/com_google_guava_failureaccess/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
170170
file://${S}/third_party/android_deps/libs/com_google_guava_guava_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
171-
file://${S}/third_party/android_deps/libs/com_google_guava_listenablefuture/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
172171
file://${S}/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
173172
file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
174173
file://${S}/third_party/android_deps/libs/io_grpc_grpc_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -225,12 +224,13 @@ LIC_FILES_CHKSUM = "\
225224
file://${S}/third_party/cros-components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
226225
file://${S}/third_party/d3/src/LICENSE;md5=fcc83e5a00c3ea5885051b46163bd453 \
227226
file://${S}/third_party/dav1d/LICENSE;md5=59cb7015cbeea4a8675b9bdb657d41b3 \
228-
file://${S}/third_party/dawn/LICENSE;md5=94758054e79f4a16d45043dfa6248541 \
227+
file://${S}/third_party/dawn/LICENSE;md5=69558ae12e1997226758845b299ef47b \
229228
file://${S}/third_party/decklink/LICENSE;md5=85b197f7b7b1ef270b01a1b6377be50e \
230229
file://${S}/third_party/devtools-frontend/src/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
231230
file://${S}/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE;md5=6e381572c3ee395547475a1464db5060 \
232231
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror.next/LICENSE;md5=b5494d4f10ac6bb043e5f684e59cd13f \
233232
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE;md5=8554e1ee437cc3fb3cfee9ad4a11b8ab \
233+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
234234
file://${S}/third_party/devtools-frontend/src/front_end/third_party/diff/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
235235
file://${S}/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
236236
file://${S}/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE;md5=913015c0e75ff89ef9461fadca555f65 \
@@ -248,7 +248,7 @@ LIC_FILES_CHKSUM = "\
248248
file://${S}/third_party/expat/src/expat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb \
249249
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
250250
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
251-
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=5cdcfe11c9cfd8fe691f8feb32ff12a9 \
251+
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=c1235892a92f75dfbc599772072869cd \
252252
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
253253
file://${S}/third_party/flac/COPYING.Xiph;md5=3d6da238b5b57a0965d6730291119f65 \
254254
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
@@ -361,7 +361,7 @@ LIC_FILES_CHKSUM = "\
361361
file://${S}/third_party/skia/LICENSE;md5=822f02cc7736281816581cd064afbb1c \
362362
file://${S}/third_party/smhasher/LICENSE;md5=0d948322ab524e2b74f55eb8ef57c74a \
363363
file://${S}/third_party/snappy/src/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c \
364-
file://${S}/third_party/speech-dispatcher/COPYING;md5=5828ebb4b7590269a994ed46b0a70df0 \
364+
file://${S}/third_party/speech-dispatcher/COPYING.LGPL;md5=4b54a1fd55a448865a0b32d41598759d \
365365
file://${S}/third_party/sqlite/LICENSE;md5=7256769d4613c0af5a72be32ba20ccf7 \
366366
file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \
367367
file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \
@@ -382,7 +382,7 @@ LIC_FILES_CHKSUM = "\
382382
file://${S}/third_party/vulkan-deps/spirv-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
383383
file://${S}/third_party/vulkan-deps/vulkan-headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
384384
file://${S}/third_party/vulkan-deps/vulkan-loader/src/LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac \
385-
file://${S}/third_party/vulkan_memory_allocator/LICENSE.txt;md5=28469cb09e41bc708efbb6a69fb39a29 \
385+
file://${S}/third_party/vulkan_memory_allocator/LICENSE.txt;md5=6eed3e06ed116324029b9de40eaf0ee5 \
386386
file://${S}/third_party/wayland-protocols/gtk/COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
387387
file://${S}/third_party/wayland-protocols/kde/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
388388
file://${S}/third_party/wayland-protocols/src/COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
@@ -393,7 +393,6 @@ LIC_FILES_CHKSUM = "\
393393
file://${S}/third_party/wuffs/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
394394
file://${S}/third_party/x11proto/LICENSE;md5=f242876648161c7208413d60498dc20d \
395395
file://${S}/third_party/xdg-utils/LICENSE;md5=a5367a90934098d6b05af3b746405014 \
396-
file://${S}/third_party/xdg_shared_mime_info/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
397396
file://${S}/third_party/xnnpack/src/LICENSE;md5=afa8f8a91390ab659c837da57124977c \
398397
file://${S}/third_party/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \
399398
file://${S}/third_party/zstd/src/LICENSE;md5=0822a32f7acdbe013606746641746ee8 \

meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ Upstream-Status: Inappropriate
1212
Signed-off-by: Maksim Sisov <msisov@igalia.com>
1313

1414
---
15-
build/config/compiler/BUILD.gn | 12 ++++++------
15+
build/config/compiler/BUILD.gn | 11 +++++------
1616
build/config/compiler/compiler.gni | 5 +++++
17-
2 files changed, 11 insertions(+), 6 deletions(-)
17+
2 files changed, 10 insertions(+), 6 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index 6d05512..8b22e38 100644
20+
index 80bc79e..8d96afc 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -721,7 +721,7 @@ config("compiler") {
23+
@@ -766,7 +766,7 @@ config("compiler") {
2424

2525
if (is_win) {
2626
ldflags += [
2727
- "/opt:lldltojobs=all",
2828
+ "/opt:lldltojobs=" + max_jobs_per_link,
2929
"-mllvm:-import-instr-limit=$import_instr_limit",
30-
"/lldltocache:" +
31-
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
32-
@@ -735,11 +735,11 @@ config("compiler") {
30+
"-mllvm:-disable-auto-upgrade-debug-info",
31+
]
32+
@@ -777,11 +777,10 @@ config("compiler") {
3333
# usage in crbug.com/1038040. Note this will increase build time in
3434
# Chrome OS.
3535

@@ -42,10 +42,9 @@ index 6d05512..8b22e38 100644
4242
+ # linker jobs. This is still suboptimal to a potential dynamic
4343
+ # resource allocation scheme, but should be good enough.
4444
+ ldflags += [ "-Wl,--thinlto-jobs=" + max_jobs_per_link ]
45-
+
46-
if (is_apple) {
47-
ldflags += [
48-
"-Wl,-cache_path_lto," +
45+
46+
if (is_chromeos) {
47+
# ARM was originally set lower than x86 to keep the size
4948
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
5049
index b1d9297..4c7f32c 100644
5150
--- a/build/config/compiler/compiler.gni

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
2121
1 file changed, 38 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index 8b22e38..cc8eac8 100644
24+
index 80bc79e..beeb116 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1133,11 +1133,6 @@ config("compiler_cpu_abi") {
27+
@@ -1173,11 +1173,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index 8b22e38..cc8eac8 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1147,12 +1142,6 @@ config("compiler_cpu_abi") {
39+
@@ -1187,12 +1182,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index 8b22e38..cc8eac8 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1160,9 +1149,6 @@ config("compiler_cpu_abi") {
52+
@@ -1200,9 +1189,6 @@ config("compiler_cpu_abi") {
5353
if (is_android) {
5454
cflags += [ "--target=mipsel-linux-android" ]
5555
ldflags += [ "--target=mipsel-linux-android" ]
@@ -59,7 +59,7 @@ index 8b22e38..cc8eac8 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1242,8 +1228,6 @@ config("compiler_cpu_abi") {
62+
@@ -1282,8 +1268,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index 8b22e38..cc8eac8 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1291,9 +1275,6 @@ config("compiler_cpu_abi") {
71+
@@ -1331,9 +1315,6 @@ config("compiler_cpu_abi") {
7272
if (is_android) {
7373
cflags += [ "--target=mips64el-linux-android" ]
7474
ldflags += [ "--target=mips64el-linux-android" ]
@@ -78,7 +78,7 @@ index 8b22e38..cc8eac8 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1351,8 +1332,6 @@ config("compiler_cpu_abi") {
81+
@@ -1391,8 +1372,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index 8b22e38..cc8eac8 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1515,23 +1494,6 @@ config("compiler_deterministic") {
90+
@@ -1555,23 +1534,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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 025203d..0c196bb 100644
32+
index 01159bc..b94a2ae 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2134,6 +2134,7 @@ template("run_torque") {
35+
@@ -2147,6 +2147,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-
@@ -2291,6 +2292,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2304,6 +2305,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-
@@ -2330,6 +2332,7 @@ template("run_mksnapshot") {
51+
@@ -2343,6 +2345,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-
@@ -6931,6 +6934,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7023,6 +7026,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0005-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 <Randy.MacLeod@windriver.com>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index cc8eac8..65b2b2d 100644
16+
index beeb116..c19ac04 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1777,6 +1777,11 @@ config("default_warnings") {
19+
@@ -1817,6 +1817,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

meta-chromium/recipes-browser/chromium/files/0006-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 <Randy.MacLeod@windriver.com>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 55479f4..da031c1 100644
21+
index 24f2397..b716e48 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1101,7 +1101,9 @@ component("base") {
24+
@@ -1105,7 +1105,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/0007-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
2424
2 files changed, 11 insertions(+), 17 deletions(-)
2525

2626
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
27-
index 65b2b2d..f8777fe 100644
27+
index c19ac04..0cd7f4d 100644
2828
--- a/build/config/compiler/BUILD.gn
2929
+++ b/build/config/compiler/BUILD.gn
30-
@@ -1433,7 +1433,6 @@ config("compiler_codegen") {
30+
@@ -1473,7 +1473,6 @@ config("compiler_codegen") {
3131
config("compiler_deterministic") {
3232
cflags = []
3333
ldflags = []
3434
- swiftflags = []
3535

3636
# Eliminate build metadata (__DATE__, __TIME__ and __TIMESTAMP__) for
3737
# deterministic build. See https://crbug.com/314403
38-
@@ -1462,20 +1461,12 @@ config("compiler_deterministic") {
38+
@@ -1502,20 +1501,12 @@ config("compiler_deterministic") {
3939
# different build directory like "out/feature_a" and "out/feature_b" if
4040
# we build same files with same compile flag.
4141
# Other paths are already given in relative, no need to normalize them.
@@ -63,10 +63,10 @@ index 65b2b2d..f8777fe 100644
6363
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
6464
asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
6565
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
66-
index 4c7f32c..b09cd2d 100644
66+
index b1d9297..06c15ea 100644
6767
--- a/build/config/compiler/compiler.gni
6868
+++ b/build/config/compiler/compiler.gni
69-
@@ -268,8 +268,11 @@ declare_args() {
69+
@@ -263,8 +263,11 @@ declare_args() {
7070
# deterministic builds to reduce compile times, so this is less relevant for
7171
# official builders.
7272
strip_absolute_paths_from_debug_symbols_default =

0 commit comments

Comments
 (0)