Merge ~nteodosio/chromium-browser:dev into ~chromium-team/chromium-browser/+git/snap-from-source:dev

[Nathan Teodosio]

[Olivier Tilloy (osomon)]

LGTM, thanks Nathan!

review: Approve

diff --git a/build/chromium-patches/build-script-limit-compile-jobs.patch b/build/chromium-patches/build-script-limit-compile-jobs.patch
new file mode 100644
index 0000000..59fd6c2
--- /dev/null
+++ b/build/chromium-patches/build-script-limit-compile-jobs.patch
@@ -0,0 +1,20 @@
+Description: Compile the bootstrap compiler with a limited (empirically
+determined) number of jobs on Arm64. Ninja defaults to NCPU jobs (NCPU being
+the number of CPUs the system has). This was observed to exhaust the memory
+of Arm64 Launchpad builders, triggering the OOM killer.
+Author: Nathan Pratta Teodosio <[e-mail]>
+Forwarded: not-needed
+
+--- a/tools/clang/scripts/build.py
++++ b/tools/clang/scripts/build.py
+@@ -746,6 +746,10 @@
+         # Ignore args.disable_asserts for the bootstrap compiler.
+         '-DLLVM_ENABLE_ASSERTIONS=ON',
+     ]
++    if sys.platform.startswith('linux') and platform.machine() == 'aarch64':
++      bootstrap_args.extend([
++          '-DLLVM_PARALLEL_COMPILE_JOBS=2',
++          ])
+     if sys.platform == 'darwin':
+       # On macOS, the bootstrap toolchain needs to have compiler-rt because
+       # dsymutil's link needs libclang_rt.osx.a. Only the x86_64 osx
diff --git a/build/chromium-patches/series b/build/chromium-patches/series
index 6bff65c..9a7fd85 100644
--- a/build/chromium-patches/series
+++ b/build/chromium-patches/series
@@ -12,6 +12,7 @@ build-script-predownload-pgo-training-source.patch
 build-script-fix-bootstrap-targets.patch
 build-script-unset-default-target-triple.patch
 build-script-revert-build-with-stable-clang.patch
+build-script-limit-compile-jobs.patch
 chromedriver-snap-compatibility.patch
 node-update-binaries-arch-specific.patch
 libaom-armhf-build-cpudetect.patch