Skip to content

Commit

Permalink
chromium: update to 109.0.5414.74
Browse files Browse the repository at this point in the history
Disable qt config since it seems to be a work in progress.

Change chromium-gn.inc to deal with:
   07f51c6723906 [PA] Introduce use_partition_alloc_as_malloc (2 of N)
       This is one in the series of CLs that aims at replacing use_allocator
       and use_partition_alloc_as_malloc with use_partition_alloc_as_malloc.
         use_allocator == "partition" <=> use_partition_alloc_as_malloc == true
         use_allocator == "none" <=> use_partition_alloc_as_malloc == false
and add enable_backup_ref_ptr_support=false to silence the check added here:
   49aa6cc5fa202 allocator.gni: Assert that BRP relies on PA-E
Also changed use_allocator and added enable_backup_ref_ptr_support=false for armv6
but it hasn't been tested.

Drop last part of patch:
   0020-Fix-tab-crashes-on-musl.patch
since commit:
   df99866b5421c [Linux sandbox] Move various sched_* syscalls into base policy
moved the code into:
$ rg -C 3 "__NR_sched_getaffinity"  sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
228-
229-  // The scheduling syscalls are used in threading libraries and also heavily in
230-  // abseil. See for example https://crbug.com/1370394.
231:  if (sysno == __NR_sched_getaffinity || sysno == __NR_sched_getparam ||
232-      sysno == __NR_sched_getscheduler || sysno == __NR_sched_setscheduler) {
233-    return RestrictSchedTarget(current_pid, sysno);
234-  }
Note that the policy has changed so there may be a runtime impact but restricting
the usage seems safe.

Drop 0019-adjust-thread-stack-sizes.patch
   36644a0b6c6ee base: deal with small pthread stack defaults
   c388bdbe2c88a shutdown: don't use a bespoke size for the shutdown thread stack
This last commit switches to using the default thread stack size.

Adjust fix-narrowing-cast.patch
   44835da632de1 base: remove GetFileSystemType
since one file was removed by the change above.

Add 0015-drop-gsimple-template-names.patch to enable building with clang12 where
the -gsimple-template-names option doesn't exist. This can be a significant space
savings:
   https://chromium-review.googlesource.com/c/chromium/src/+/3988987
so the option should be enabled as soon a clang12 support is dropped.

and finally rebase patches in a single bound using super-devtool now
with SRC_URI:append support!

License changes:
----------------

Added licenses:
  * third_party/crubit/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3756853

  * third_party/swift-toolchain/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3722369

Removed licenses:
  * chrome/browser/ui/android/layouts/third_party/float_property/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/4003424

  * third_party/android_deps/libs/android_arch_core_common/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/1142189

  * third_party/android_deps/libs/com_google_flatbuffers_flatbuffers_java/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3967190

  * third_party/libgifcodec/LICENSE.md
  - unable to find using chromium-review or git repo.

Updated licenses:
  * LICENSE
  * LICENSE.chromium_os
  - https://chromium-review.googlesource.com/c/chromium/src/+/3887619

  * v8/LICENSE
    The v8 license was updated to delete mips32 from v8 in v8 commit:
       a26ca5ed147 [mips32] Delete mips32 from v8
  - https://chromium-review.googlesource.com/c/v8/v8/+/3837160

  * third_party/android_crazy_linker/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3918915

  * third_party/ced/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3936784

  * third_party/dom_distiller_js/LICENSE
  - chromium/dom-distiller@2a18039

  * third_party/google_trust_services/src/LICENSE
  * third_party/gvr-android-sdk/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3938304

  * third_party/ipcz/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3918735

  * third_party/liburlpattern/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3937444

  * third_party/metrics_proto/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3933378

  * third_party/pdfium/LICENSE
  - https://pdfium.googlesource.com/pdfium.git/+/832a694e52c44e206598eff8c7d1797d47117d1b

Test-built:
-----------

* chromium-ozone-wayland:
 - master, clang,    MACHINE=qemux86-64, qemuarm64, qemuarm

* chromium-x11
 - master, clang,    MACHINE=qemux86-64, qemuarm64, qemuarm, raspberrypi-64
 - kirkstone, clang, MACHINE=qemux86-64, qemuarm64, qemuarm
 - dunfell, clang**, MACHINE=qemux86-64

** Please note that Chromium requires clang version to be >= 12.
For that, when on dunfell branch, use the latest meta-clang/clang12 branch.

Drop two upstreamed patches.
  0014-grit-util-py-remove-deprecated-mode-for-open.patch
  0015-Avoid-inadvertently-adding-a-wayland-dependency.patch

Rebase and fix musl patches with devtool and fix-up two patches as described below.
Update and adjust:
   0009-provide-res_ninit-and-nclose-APIs-on-non-glibc-linux.patch
since commit:
   3eef9d7a3ecc6 Move HostResolverSystemTask (formerly ProcTask) to new file
moved code around.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
  • Loading branch information
rwmacleod authored and rakuco committed Jan 21, 2023
1 parent 068b693 commit f2d5539
Show file tree
Hide file tree
Showing 42 changed files with 456 additions and 337 deletions.
16 changes: 10 additions & 6 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ SRC_URI += " \
file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
file://0010-Revert-ios-Fix-breakpoint-in-Swift-files.patch \
file://0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
file://0012-Build-X11-parts-only-for-ozone_platform_x11.patch \
file://0013-Fix-html_minifier-script-for-node-v12.patch \
file://0014-grit-util-py-remove-deprecated-mode-for-open.patch \
file://0015-Avoid-inadvertently-adding-a-wayland-dependency.patch \
file://0014-blink-Fix-includes-for-metronome_source.patch \
file://0015-drop-gsimple-template-names.patch \
file://0016-cast-to-bool-to-avoid-constexpr-error.patch \
"

SRC_URI:append:libc-musl = "\
Expand All @@ -40,7 +41,6 @@ SRC_URI:append:libc-musl = "\
file://musl/0012-debug-Fix-build-with-musl.patch \
file://musl/0015-mallopt-is-glibc-specific-API.patch \
file://musl/0018--Use-monotonic-clock-for-pthread_cond_timedwait-with-.patch \
file://musl/0019-adjust-thread-stack-sizes.patch \
file://musl/0020-Fix-tab-crashes-on-musl.patch \
file://musl/0021-pthread_getname_np.patch \
file://musl/0022-sys-stat.patch \
Expand Down Expand Up @@ -153,6 +153,10 @@ GN_ARGS = " \
# chromium-94
GN_ARGS += "use_system_freetype=false"

# Qt support appears to be underdevelopment in Nov 2022 so disable now
# but a PACKAGECONFIG option should be added when the feature is ready.
GN_ARGS += "use_qt=false"

# Closure_compile needs to be disabled to avoid pulling in java dependencies,
# which are typicaly not wanted. It started to happen after https://crrev.com/c/1278470
# This argument was renamed to enable_js_type_check after https://crrev.com/c/2248564
Expand Down Expand Up @@ -320,15 +324,15 @@ GN_ARGS:append:arm = ' \
'
# tcmalloc's atomicops-internals-arm-v6plus.h uses the "dmb" instruction that
# is not available on (some?) ARMv6 models, which causes the build to fail.
GN_ARGS:append:armv6 = ' use_allocator="none"'
GN_ARGS:append:armv6 = ' use_partition_alloc_as_malloc=false enable_backup_ref_ptr_support=false'
# The WebRTC code fails to build on ARMv6 when NEON is enabled.
# https://bugs.chromium.org/p/webrtc/issues/detail?id=6574
GN_ARGS:append:armv6 = ' arm_use_neon=false'

# Disable glibc shims on musl
# tcmalloc does not play well with musl as of M62 (and possibly earlier).
# https://github.com/gperftools/gperftools/issues/693
GN_ARGS:append:libc-musl = ' use_allocator_shim=false use_allocator="none"'
GN_ARGS:append:libc-musl = ' use_allocator_shim=false use_partition_alloc_as_malloc=false enable_backup_ref_ptr_support=false'

CHROMIUM_EXTRA_ARGS ?= " \
${@bb.utils.contains('PACKAGECONFIG', 'use-egl', '--use-gl=egl', '', d)} \
Expand Down
34 changes: 14 additions & 20 deletions meta-chromium/recipes-browser/chromium/chromium.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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] = "0f091b4950e120d5c3e23ab391bacfdb6ce8eb8d0acab55e9dae1a8c247dd192"
SRC_URI[sha256sum] = "eded233c26ab631be325ad49cb306c338513b6a6528197d42653e66187548e5d"

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

Expand Down Expand Up @@ -57,8 +57,8 @@ LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-2.1-or-later"

# The generate_license_list.py script can help generate and update this list.
LIC_FILES_CHKSUM = "\
file://${S}/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
file://${S}/LICENSE.chromium_os;md5=87dd8458232da630f5617873d42d8350 \
file://${S}/LICENSE;md5=c408a301e3407c3803499ce9290515d6 \
file://${S}/LICENSE.chromium_os;md5=775979d3e1e3bf163e4882e231727de5 \
file://${S}/base/third_party/cityhash/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
file://${S}/base/third_party/cityhash_v103/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
file://${S}/base/third_party/double_conversion/LICENSE;md5=1ea35644f0ec0d9767897115667e901f \
Expand All @@ -72,7 +72,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/buildtools/third_party/libc++/trunk/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
file://${S}/buildtools/third_party/libc++abi/trunk/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
file://${S}/buildtools/third_party/libunwind/trunk/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
file://${S}/chrome/browser/ui/android/layouts/third_party/float_property/LICENSE;md5=90e2812358f341d6d34df8e852cffc15 \
file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=8bbde65ae0523dc878ed1ac1252d2d14 \
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
Expand All @@ -97,8 +96,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/abseil-cpp/LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915 \
file://${S}/third_party/accessibility-audit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/afl/src/docs/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_crazy_linker/LICENSE;md5=997351b5bb1c56ca5be66be8060bb383 \
file://${S}/third_party/android_deps/libs/android_arch_core_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_crazy_linker/LICENSE;md5=6ac427101b06097fd70652bb9238ca23 \
file://${S}/third_party/android_deps/libs/android_arch_core_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common_java8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -176,7 +174,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector/LICENSE;md5=a5923809e496d46d8842ab7d8a52621f \
file://${S}/third_party/android_deps/libs/com_google_firebase_firebase_messaging/LICENSE;md5=6287e01249a45d9de9bc62ca9163c913 \
file://${S}/third_party/android_deps/libs/com_google_flatbuffers_flatbuffers_java/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_guava_failureaccess/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_guava_guava_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_guava_listenablefuture/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -215,7 +212,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/brotli/LICENSE;md5=941ee9cd1609382f946352712a319b4b \
file://${S}/third_party/bspatch/LICENSE;md5=3e837ede9697ce4c789c3ca32aabe003 \
file://${S}/third_party/cast_core/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
file://${S}/third_party/ced/LICENSE;md5=3947f60c9d4b1ba51d193af511855a55 \
file://${S}/third_party/ced/LICENSE;md5=f63cd7e51ca7b7aac748e20dc60e083f \
file://${S}/third_party/chromevox/LICENSE;md5=45739090b454125d851ac7bb1bbd23a2 \
file://${S}/third_party/cld_3/LICENSE;md5=d8b32ba83f8b11e4badd979f4319e706 \
file://${S}/third_party/cldr/LICENSE;md5=fe2500bb52e825476d4b93d6f1458232 \
Expand All @@ -230,7 +227,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/dawn/LICENSE;md5=94758054e79f4a16d45043dfa6248541 \
file://${S}/third_party/decklink/LICENSE;md5=85b197f7b7b1ef270b01a1b6377be50e \
file://${S}/third_party/devtools-frontend/src/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE;md5=33e8b86a084578431a31c72608f226b8 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE;md5=33e8b86a084578431a31c72608f226b8 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror.next/LICENSE;md5=b5494d4f10ac6bb043e5f684e59cd13f \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE;md5=8554e1ee437cc3fb3cfee9ad4a11b8ab \
Expand All @@ -240,17 +236,16 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE;md5=cfc0c20794ef30f41515b56ff0d51668 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE;md5=b8f1fc4a170646d6f75d9572a3bd1339 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/dom_distiller_js/LICENSE;md5=1399a5b89c7ed8167d261770432511e8 \
file://${S}/third_party/dom_distiller_js/LICENSE;md5=6cd778870ce5c0c08c8e16fbdf378532 \
file://${S}/third_party/eigen3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/emoji-metadata/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/emoji-segmenter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/expat/src/expat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=3554336ba19bba1f85e4bf7da9424f32 \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=edd5404ebfcb158090789e3cb2cb494d \
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
file://${S}/third_party/flac/COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
Expand All @@ -264,10 +259,10 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/google-closure-library/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
file://${S}/third_party/google_input_tools/LICENSE;md5=ff0b0f0202337c9d4ae2d869797049d3 \
file://${S}/third_party/google_toolbox_for_mac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/google_trust_services/src/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
file://${S}/third_party/google_trust_services/src/LICENSE;md5=cfaf8febfe7b4f3e07a08dd4d0db1914 \
file://${S}/third_party/grpc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/gvr-android-keyboard/LICENSE;md5=67d07a07ec29a50a3ded12b2ba952257 \
file://${S}/third_party/gvr-android-sdk/LICENSE;md5=50b9d1f02b2ee0d8a568ccf4d35216e2 \
file://${S}/third_party/gvr-android-sdk/LICENSE;md5=634fdf826e0846931133dca5785f59b8 \
file://${S}/third_party/harfbuzz-ng/src/COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
file://${S}/third_party/highway/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
file://${S}/third_party/hunspell/COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \
Expand All @@ -276,7 +271,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \
file://${S}/third_party/icu/LICENSE;md5=a89d03060ff9c46552434dbd1fe3ed1f \
file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
file://${S}/third_party/ipcz/LICENSE;md5=12ba2bbc8799113da234257d46138649 \
file://${S}/third_party/ipcz/LICENSE;md5=1649e1dc663940b442197bd7f99cd228 \
file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
file://${S}/third_party/jinja2/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \
file://${S}/third_party/jsoncpp/LICENSE;md5=c56ee55c03a55f8105b969d8270632ce \
Expand All @@ -291,7 +286,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/libbrlapi/LICENSE;md5=fad9b3332be894bab9bc501572864b29 \
file://${S}/third_party/libevent/LICENSE;md5=a2b0302a710150293fb85d2bfabd3de6 \
file://${S}/third_party/libgav1/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/libgifcodec/LICENSE.md;md5=1018a09551825ebc78d78f84855e07fa \
file://${S}/third_party/libipp/LICENSE;md5=af9e58383a1b2b17c75c6c9ff561ca9d \
file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=a75feaa2de6d8942f50d412241fca1f1 \
Expand All @@ -304,7 +298,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/libsrtp/LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1 \
file://${S}/third_party/libsync/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/libudev/LICENSE;md5=4fbd65380cdd255951079008b364516c \
file://${S}/third_party/liburlpattern/LICENSE;md5=585b04bdf5d1b0ea43df74fde02984eb \
file://${S}/third_party/liburlpattern/LICENSE;md5=5be7cac9f8920c488c4dda56dbfeaec2 \
file://${S}/third_party/libusb/src/COPYING;md5=fbc093901857fcd118f065f900982c24 \
file://${S}/third_party/libvpx/source/libvpx/LICENSE;md5=d5b04755015be901744a78cc30d390d4 \
file://${S}/third_party/libwebm/source/LICENSE.TXT;md5=6e8dee932c26f2dab503abf70c96d8bb \
Expand All @@ -322,7 +316,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/material_design_icons/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
file://${S}/third_party/material_web_components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/mesa_headers/LICENSE;md5=072744090020e72ad7387e201873fe43 \
file://${S}/third_party/metrics_proto/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
file://${S}/third_party/metrics_proto/LICENSE;md5=cfaf8febfe7b4f3e07a08dd4d0db1914 \
file://${S}/third_party/microsoft_webauthn/LICENSE;md5=b98fddd052bb2f5ddbcdbd417ffb26a8 \
file://${S}/third_party/minigbm/LICENSE;md5=fcd558ab2fd7f53408826e80eb0c11eb \
file://${S}/third_party/minizip/src/LICENSE;md5=3fb541eb8359212703e21d14eba7ac64 \
Expand All @@ -336,7 +330,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/openscreen/src/LICENSE;md5=d5fead7a94377fb7b73964d9144c6cbb \
file://${S}/third_party/opus/src/COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3 \
file://${S}/third_party/ots/LICENSE;md5=e06eff2aa65b917034a81599bea73dc4 \
file://${S}/third_party/pdfium/LICENSE;md5=efe815679251504905d0f2c88a77c886 \
file://${S}/third_party/pdfium/LICENSE;md5=c93507531cc9bb8e24a05f2a1a4036c7 \
file://${S}/third_party/perfetto/LICENSE;md5=f87516e0b698007e9e75a1fe1012b390 \
file://${S}/third_party/pffft/LICENSE;md5=0f39e43e9bc20e7e103e54750e1ec3a2 \
file://${S}/third_party/ply/LICENSE;md5=f298aa3b0cfe0b0ea96acabf944529c0 \
Expand Down Expand Up @@ -400,7 +394,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/zxcvbn-cpp/LICENSE.txt;md5=50f9303d0b3adb4952217b0d8c00d83f \
file://${S}/tools/mac/power/protos/third_party/pprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
file://${S}/v8/LICENSE;md5=6611673a9587a522034a4be8f4df564c \
file://${S}/v8/LICENSE;md5=f38a2942edcfe4abb45e9a83a1ad2f82 \
file://${S}/v8/LICENSE.fdlibm;md5=b17367d6c97e638599071d99a3049dfe \
file://${S}/v8/LICENSE.strongtalk;md5=956a43818dd13f2e93088fc2c93589d2 \
"
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
Upstream-Status: Inappropriate

Signed-off-by: Maksim Sisov <msisov@igalia.com>
---
From ab74e60870e8f515c5b94f90d9b0741492950de6 Mon Sep 17 00:00:00 2001
From b8384ef181084c630d0073dcb81dfd338da40c42 Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Wed, 15 Sep 2021 14:29:03 +0300
Subject: [PATCH] limit number of LTO jobs.

--thinlto-jobs accepts "all" only since llvm 13. Dunfell
branch uses quite old llvm that doesn't support this keyword.
Thus, use the previously used number of threads.

Upstream-Status: Inappropriate

Signed-off-by: Maksim Sisov <msisov@igalia.com>

---
build/config/compiler/BUILD.gn | 12 ++++++------
build/config/compiler/compiler.gni | 5 +++++
2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 0272bf80f31fe..f4a3ec22c9b45 100644
index d72f810e7e..a8acdbf354 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -642,7 +642,7 @@ config("compiler") {
@@ -670,7 +670,7 @@ config("compiler") {

if (is_win) {
ldflags += [
Expand All @@ -28,7 +29,7 @@ index 0272bf80f31fe..f4a3ec22c9b45 100644
"-mllvm:-import-instr-limit=$import_instr_limit",
"/lldltocache:" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
@@ -655,11 +655,11 @@ config("compiler") {
@@ -683,11 +683,11 @@ config("compiler") {
# usage in crbug.com/1038040. Note this will increase build time in
# Chrome OS.

Expand All @@ -43,10 +44,10 @@ index 0272bf80f31fe..f4a3ec22c9b45 100644
+ ldflags += [ "-Wl,--thinlto-jobs=" + max_jobs_per_link ]
+
if (is_apple) {
ldflags += [
"-Wl,-cache_path_lto," +
_object_path_suffix = ""
if (is_ios) {
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
index 5550eecf14873..c84b69fc72233 100644
index 17c7d03a83..6cffb95808 100644
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -97,6 +97,11 @@ declare_args() {
Expand Down

0 comments on commit f2d5539

Please sign in to comment.