Skip to content

Commit 2f5fe79

Browse files
committed
chromium: update to 110.0.5481.77
Release notes: https://chromereleases.googleblog.com/2023/02/stable-channel-update-for-desktop.html Build and patch changes: ------------------------ Add DEPENDS on libffi as Chromium doesn't allow building with system libwayland anymore, and needs libffi to build its own libwayland. Add libffi_%.bbappend to also copy the PIC version of libffi.a to the sysroot, as Chromium needs it. This is the same approach that Debian takes, which Chromium uses for its sysroot: https://sources.debian.org/src/libffi/3.4.4-1/debian/rules/#L103 Remove angle_use_wayland build arg as Chromium now uses Wayland >= 1.20. Update generate_license_list.py to adapt to: 2be00b963986 Move license tooling into //tools/licenses Merge 0010-Revert-ios-Fix-breakpoint-in-Swift-files.patch with 0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch, as proposed in the former patch's commit message: > This should be fixed by merging these two patches in the next rebase > and the changes to toolchain/ios/swiftc.py dropped. Drop backported 0012-Build-X11-parts-only-for-ozone_platform_x11.patch, which was already removed from the build in the update to 109. Update 0013-Fix-html_minifier-script-for-node-v12.patch's Upstream-Status to Inappropriate, per discussion with the maintainer: https://crrev.com/c/4239697. Drop backported 0014-blink-Fix-includes-for-metronome_source.patch. Rebase remaining patches. License changes: ---------------- Added licenses: * ios/third_party/lottie/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4024225 * third_party/android_deps/libs/android_arch_core_common/LICENSE - https://chromium-review.googlesource.com/837189 (added), https://chromium-review.googlesource.com/1142189 (renamed) * third_party/android_deps/libs/com_google_android_annotations/LICENSE * third_party/android_deps/libs/io_grpc_grpc_api/LICENSE * third_party/android_deps/libs/io_grpc_grpc_binder/LICENSE * third_party/android_deps/libs/io_grpc_grpc_context/LICENSE * third_party/android_deps/libs/io_grpc_grpc_core/LICENSE * third_party/android_deps/libs/io_grpc_grpc_protobuf_lite/LICENSE * third_party/android_deps/libs/io_grpc_grpc_stub/LICENSE * third_party/android_deps/libs/io_perfmark_perfmark_api/LICENSE * third_party/grpc-java/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3873634 * third_party/android_deps/libs/com_google_code_gson_gson/LICENSE - https://chromium-review.googlesource.com/611205 (added), https://chromium-review.googlesource.com/c/chromium/src/+/2035868 (renamed) * third_party/android_deps/libs/org_checkerframework_checker_util/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3924222 * third_party/fxdiv/src/LICENSE - Maratyszcza/FXdiv@7b56884 (added), Maratyszcza/FXdiv@8f85044 (updated), Maratyszcza/FXdiv@1b24403 (updated) * third_party/omnibox_proto/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3835067 (added), https://chromium-review.googlesource.com/c/chromium/src/+/3933652 (updated) * third_party/pthreadpool/src/LICENSE - Maratyszcza/pthreadpool@ea39ab3 (added), Maratyszcza/pthreadpool@faf6ff3 (updated), Maratyszcza/pthreadpool@1063343 (updated), Maratyszcza/pthreadpool@097a0c8 (updated), Maratyszcza/pthreadpool@e6be7fc (updated) * third_party/selenium-atoms/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3873289 * third_party/tensorflow_models/src/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3936251 * third_party/xdg_shared_mime_info/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3848953 * third_party/xnnpack/src/LICENSE - google/XNNPACK@b455b12 Removed licenses: * third_party/android_crazy_linker/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4055528 * third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/LICENSE * third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4076267 * third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE - https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/4060452 * third_party/libjxl/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4081749 Updated licenses: * third_party/expat/src/expat/COPYING - libexpat/libexpat@39b2e99 * third_party/ffmpeg/CREDITS.chromium - https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/d4fb415 * third_party/lzma_sdk/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4066373 * third_party/mozilla/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4062607 Test-built: ----------- * chromium-ozone-wayland: - langdale, clang, MACHINE=qemuarm64 - kirkstone, clang, MACHINE=raspberrypi3 * chromium-x11 - master, clang, MACHINE=qemux86-64, qemuarm, raspberrypi4-64 - kirkstone, clang, MACHINE=qemux86-64, qemuarm, raspberrypi4-64 - dunfell, clang**, MACHINE=raspberrypi3 ** Please note that Chromium requires clang version to be >= 12. For that, when on dunfell branch, use the latest meta-clang/dunfell-clang12 branch. Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 parent d5d3b82 commit 2f5fe79

20 files changed

+113
-283
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ SRC_URI += " \
1919
file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
2020
file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
2121
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
22-
file://0010-Revert-ios-Fix-breakpoint-in-Swift-files.patch \
2322
file://0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
2423
file://0013-Fix-html_minifier-script-for-node-v12.patch \
25-
file://0014-blink-Fix-includes-for-metronome_source.patch \
2624
file://0015-drop-gsimple-template-names.patch \
2725
file://0016-cast-to-bool-to-avoid-constexpr-error.patch \
2826
"
@@ -69,6 +67,7 @@ DEPENDS += " \
6967
gtk+3 \
7068
jpeg \
7169
libdrm \
70+
libffi \
7271
libwebp \
7372
libxkbcommon \
7473
libxslt \

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_109.0.5414.74.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_110.0.5481.77.bb

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,10 @@ GN_ARGS += "\
1919
system_wayland_scanner_path="${STAGING_BINDIR_NATIVE}/wayland-scanner" \
2020
use_system_wayland_scanner=true \
2121
use_xkbcommon=true \
22-
use_system_libwayland=true \
2322
use_system_minigbm=true \
2423
use_system_libdrm=true \
2524
use_gtk=false \
2625
"
2726

2827
# The chromium binary must always be started with those arguments.
2928
CHROMIUM_EXTRA_ARGS:append = " --ozone-platform=wayland"
30-
31-
# Angle is not used by Wayland yet, but it was still built. It wasn't a problem
32-
# until wayland-protocols were updated to 1.20 in newest yocto releases, which
33-
# changed the implementation of the wayland-scanner tool. That tool uses a new
34-
# API, which is not part of older wayland-protocols. And given ANGLE includes
35-
# libwayland headers from //third_party/wayland instead of relaying on the
36-
# system ones, that results in undeclared methods.
37-
# TODO(msisov): remove this once Chromium's //third_party/wayland is updated
38-
# to >=1.20. This tracks https://crbug.com/1359189
39-
GN_ARGS += "\
40-
angle_use_wayland=false \
41-
"

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

Lines changed: 25 additions & 10 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] = "eded233c26ab631be325ad49cb306c338513b6a6528197d42653e66187548e5d"
7+
SRC_URI[sha256sum] = "e348ab2dc4311083e729d714a81e95dd9db108ff71437dde451c97ac939881ce"
88

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

@@ -78,6 +78,7 @@ LIC_FILES_CHKSUM = "\
7878
file://${S}/courgette/third_party/bsdiff/LICENCE;md5=7c2ad392281bc3d9b04a31102ee7abdd \
7979
file://${S}/courgette/third_party/divsufsort/LICENSE;md5=e261f081e52882dad3ff0225497ce451 \
8080
file://${S}/ios/third_party/blink/LICENSE;md5=9fdb47308c4e0a2b6d07c5af39e5da1a \
81+
file://${S}/ios/third_party/lottie/LICENSE;md5=1e714768add1e7fdb1288bac703bad06 \
8182
file://${S}/ios/third_party/material_components_ios/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
8283
file://${S}/ios/third_party/material_font_disk_loader_ios/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
8384
file://${S}/ios/third_party/material_internationalization_ios/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -96,7 +97,7 @@ LIC_FILES_CHKSUM = "\
9697
file://${S}/third_party/abseil-cpp/LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915 \
9798
file://${S}/third_party/accessibility-audit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9899
file://${S}/third_party/afl/src/docs/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
99-
file://${S}/third_party/android_crazy_linker/LICENSE;md5=6ac427101b06097fd70652bb9238ca23 \
100+
file://${S}/third_party/android_deps/libs/android_arch_core_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
100101
file://${S}/third_party/android_deps/libs/android_arch_core_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
101102
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
102103
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common_java8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -134,8 +135,7 @@ LIC_FILES_CHKSUM = "\
134135
file://${S}/third_party/android_deps/libs/com_android_support_transition/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
135136
file://${S}/third_party/android_deps/libs/com_android_support_versionedparcelable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
136137
file://${S}/third_party/android_deps/libs/com_android_support_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
137-
file://${S}/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f \
138-
file://${S}/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/LICENSE;md5=b6cda58008bb60623be55223bfe531b3 \
138+
file://${S}/third_party/android_deps/libs/com_google_android_annotations/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
139139
file://${S}/third_party/android_deps/libs/com_google_android_datatransport_transport_api/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
140140
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \
141141
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \
@@ -161,6 +161,7 @@ LIC_FILES_CHKSUM = "\
161161
file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
162162
file://${S}/third_party/android_deps/libs/com_google_android_play_core/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
163163
file://${S}/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
164+
file://${S}/third_party/android_deps/libs/com_google_code_gson_gson/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
164165
file://${S}/third_party/android_deps/libs/com_google_dagger_dagger/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
165166
file://${S}/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
166167
file://${S}/third_party/android_deps/libs/com_google_firebase_firebase_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -179,9 +180,17 @@ LIC_FILES_CHKSUM = "\
179180
file://${S}/third_party/android_deps/libs/com_google_guava_listenablefuture/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
180181
file://${S}/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
181182
file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
183+
file://${S}/third_party/android_deps/libs/io_grpc_grpc_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
184+
file://${S}/third_party/android_deps/libs/io_grpc_grpc_binder/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
185+
file://${S}/third_party/android_deps/libs/io_grpc_grpc_context/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
186+
file://${S}/third_party/android_deps/libs/io_grpc_grpc_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
187+
file://${S}/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
188+
file://${S}/third_party/android_deps/libs/io_grpc_grpc_stub/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
189+
file://${S}/third_party/android_deps/libs/io_perfmark_perfmark_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
182190
file://${S}/third_party/android_deps/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
183191
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \
184192
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \
193+
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_util/LICENSE;md5=87abbc18e66acb445c00810347051776 \
185194
file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
186195
file://${S}/third_party/android_deps/libs/org_jetbrains_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
187196
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -234,18 +243,17 @@ LIC_FILES_CHKSUM = "\
234243
file://${S}/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
235244
file://${S}/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE;md5=913015c0e75ff89ef9461fadca555f65 \
236245
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
237-
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE;md5=cfc0c20794ef30f41515b56ff0d51668 \
238246
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
239247
file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
240248
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
241249
file://${S}/third_party/dom_distiller_js/LICENSE;md5=6cd778870ce5c0c08c8e16fbdf378532 \
242250
file://${S}/third_party/eigen3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
243251
file://${S}/third_party/emoji-metadata/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
244252
file://${S}/third_party/emoji-segmenter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
245-
file://${S}/third_party/expat/src/expat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
253+
file://${S}/third_party/expat/src/expat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb \
246254
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
247255
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
248-
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=edd5404ebfcb158090789e3cb2cb494d \
256+
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=5cdcfe11c9cfd8fe691f8feb32ff12a9 \
249257
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
250258
file://${S}/third_party/flac/COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
251259
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
@@ -254,12 +262,14 @@ LIC_FILES_CHKSUM = "\
254262
file://${S}/third_party/fp16/LICENSE;md5=855dd24c28c76c916c5c2301b1958728 \
255263
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
256264
file://${S}/third_party/fusejs/LICENSE;md5=f61de6d0d3d200550e44d63cc2a4fb67 \
265+
file://${S}/third_party/fxdiv/src/LICENSE;md5=0c2eed7ba400a6fea8fec2a582b177e8 \
257266
file://${S}/third_party/gemmlowp/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
258267
file://${S}/third_party/gif_player/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
259268
file://${S}/third_party/google-closure-library/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
260269
file://${S}/third_party/google_input_tools/LICENSE;md5=ff0b0f0202337c9d4ae2d869797049d3 \
261270
file://${S}/third_party/google_toolbox_for_mac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
262271
file://${S}/third_party/google_trust_services/src/LICENSE;md5=cfaf8febfe7b4f3e07a08dd4d0db1914 \
272+
file://${S}/third_party/grpc-java/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
263273
file://${S}/third_party/grpc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
264274
file://${S}/third_party/gvr-android-keyboard/LICENSE;md5=67d07a07ec29a50a3ded12b2ba952257 \
265275
file://${S}/third_party/gvr-android-sdk/LICENSE;md5=634fdf826e0846931133dca5785f59b8 \
@@ -289,7 +299,6 @@ LIC_FILES_CHKSUM = "\
289299
file://${S}/third_party/libipp/LICENSE;md5=af9e58383a1b2b17c75c6c9ff561ca9d \
290300
file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
291301
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=a75feaa2de6d8942f50d412241fca1f1 \
292-
file://${S}/third_party/libjxl/LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f \
293302
file://${S}/third_party/liblouis/LICENSE;md5=8ab69863de0d3a0e00c4f97a4d78dd4a \
294303
file://${S}/third_party/libphonenumber/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
295304
file://${S}/third_party/libpng/LICENSE;md5=b0085051bf265bac2bfc38bc89f50000 \
@@ -311,7 +320,7 @@ LIC_FILES_CHKSUM = "\
311320
file://${S}/third_party/libzip/LICENSE;md5=6bb2408fd544544b86946e67ec2da9a0 \
312321
file://${S}/third_party/logilab/logilab/common/LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe \
313322
file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \
314-
file://${S}/third_party/lzma_sdk/LICENSE;md5=a8d1f5a28cfd35e6dfea09b82672fae7 \
323+
file://${S}/third_party/lzma_sdk/LICENSE;md5=eceed1d308734c8051664bc3d1ca175e \
315324
file://${S}/third_party/maldoca/src/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
316325
file://${S}/third_party/material_design_icons/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
317326
file://${S}/third_party/material_web_components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -321,10 +330,11 @@ LIC_FILES_CHKSUM = "\
321330
file://${S}/third_party/minigbm/LICENSE;md5=fcd558ab2fd7f53408826e80eb0c11eb \
322331
file://${S}/third_party/minizip/src/LICENSE;md5=3fb541eb8359212703e21d14eba7ac64 \
323332
file://${S}/third_party/modp_b64/LICENSE;md5=eb7e2e0af1d4971360553aedadee8d86 \
324-
file://${S}/third_party/mozilla/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
333+
file://${S}/third_party/mozilla/LICENSE;md5=282100e70d38d39ebdcc47070327aec0 \
325334
file://${S}/third_party/nasm/LICENSE;md5=90904486f8fbf1861cf42752e1a39efe \
326335
file://${S}/third_party/nearby/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
327336
file://${S}/third_party/neon_2_sse/LICENSE;md5=53abad1ded16f44100126962f4bbef6c \
337+
file://${S}/third_party/omnibox_proto/LICENSE;md5=9956e3ce49f0eea45461cec47a5f96b0 \
328338
file://${S}/third_party/one_euro_filter/LICENSE;md5=5b4d092181a412ae42c63e7fc1e53366 \
329339
file://${S}/third_party/openh264/src/LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf \
330340
file://${S}/third_party/openscreen/src/LICENSE;md5=d5fead7a94377fb7b73964d9144c6cbb \
@@ -338,6 +348,7 @@ LIC_FILES_CHKSUM = "\
338348
file://${S}/third_party/private-join-and-compute/src/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
339349
file://${S}/third_party/private_membership/LICENSE;md5=9d44acd6df6b90cbbabbd467d67e74c7 \
340350
file://${S}/third_party/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
351+
file://${S}/third_party/pthreadpool/src/LICENSE;md5=1609499688b503850848d795dce4da2d \
341352
file://${S}/third_party/puffin/LICENSE;md5=b1ed361f9fc790c1054d81a7ef041a34 \
342353
file://${S}/third_party/pyjson5/src/LICENSE;md5=d2794c0df5b907fdace235a619d80314 \
343354
file://${S}/third_party/pylint/pylint/LICENSE.txt;md5=4325afd396febcb659c36b49533135d4 \
@@ -348,6 +359,7 @@ LIC_FILES_CHKSUM = "\
348359
file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \
349360
file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
350361
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
362+
file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
351363
file://${S}/third_party/setupdesign/LICENSE;md5=302a09339e8de37ba06c121279be1707 \
352364
file://${S}/third_party/shell-encryption/src/LICENSE;md5=c96a2157133614bf8a135bd27cd230d6 \
353365
file://${S}/third_party/simplejson/LICENSE.txt;md5=8a9f8dcfcd28c34daa443e5b1d29813b \
@@ -361,6 +373,7 @@ LIC_FILES_CHKSUM = "\
361373
file://${S}/third_party/swift-toolchain/LICENSE;md5=97ecb46ea45fefa64206d9b7e9671afa \
362374
file://${S}/third_party/swiftshader/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87 \
363375
file://${S}/third_party/tensorflow-text/LICENSE;md5=01e86893010a1b87e69a213faa753ebd \
376+
file://${S}/third_party/tensorflow_models/src/LICENSE;md5=6f798069926aa738ee3bbbcac6c62a2f \
364377
file://${S}/third_party/test_fonts/LICENSE;md5=a78e43d492b7bd2ad4a4529c7a6266ca \
365378
file://${S}/third_party/text-fragments-polyfill/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
366379
file://${S}/third_party/tflite/LICENSE;md5=64a34301f8e355f57ec992c2af3e5157 \
@@ -390,6 +403,8 @@ LIC_FILES_CHKSUM = "\
390403
file://${S}/third_party/wuffs/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
391404
file://${S}/third_party/x11proto/LICENSE;md5=f242876648161c7208413d60498dc20d \
392405
file://${S}/third_party/xdg-utils/LICENSE;md5=a5367a90934098d6b05af3b746405014 \
406+
file://${S}/third_party/xdg_shared_mime_info/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
407+
file://${S}/third_party/xnnpack/src/LICENSE;md5=afa8f8a91390ab659c837da57124977c \
393408
file://${S}/third_party/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \
394409
file://${S}/third_party/zxcvbn-cpp/LICENSE.txt;md5=50f9303d0b3adb4952217b0d8c00d83f \
395410
file://${S}/tools/mac/power/protos/third_party/pprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
1717
2 files changed, 11 insertions(+), 6 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index d72f810e7e..a8acdbf354 100644
20+
index 944a039d066f6..fe41eb6378372 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -670,7 +670,7 @@ config("compiler") {
24-
23+
@@ -675,7 +675,7 @@ config("compiler") {
24+
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",
3030
"/lldltocache:" +
3131
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
32-
@@ -683,11 +683,11 @@ config("compiler") {
32+
@@ -688,11 +688,11 @@ config("compiler") {
3333
# usage in crbug.com/1038040. Note this will increase build time in
3434
# Chrome OS.
35-
35+
3636
- # In ThinLTO builds, we run at most one link process at a time,
3737
- # and let it use all cores.
3838
- # TODO(thakis): Check if '=0' (that is, number of cores, instead
@@ -47,13 +47,13 @@ index d72f810e7e..a8acdbf354 100644
4747
_object_path_suffix = ""
4848
if (is_ios) {
4949
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
50-
index 17c7d03a83..6cffb95808 100644
50+
index e0d44eed7a760..21c53c1f8536b 100644
5151
--- a/build/config/compiler/compiler.gni
5252
+++ b/build/config/compiler/compiler.gni
53-
@@ -97,6 +97,11 @@ declare_args() {
53+
@@ -98,6 +98,11 @@ declare_args() {
5454
# If true, use Goma for ThinLTO code generation where applicable.
5555
use_goma_thin_lto = false
56-
56+
5757
+ # Limit the number of jobs (threads/processes) the linker is allowed
5858
+ # to use (for linkers that support this).
5959
+ # Upstream chromium uses "all" keyword that is available since llvm 13.

0 commit comments

Comments
 (0)