d6c8ff2e70* chore: bump chromium in DEPS to 119.0.6021.0 * 4727729: Initial ScreenCaptureKit AudioInputStream implementation https://chromium-review.googlesource.com/c/chromium/src/+/4727729 * chore: fixup patch indices * chore: bump chromium in DEPS to 119.0.6023.0 * 4875713: mac: Switch to Xcode 15.0 15A240d with macOS SDK 14.0 23A334 https://chromium-review.googlesource.com/c/chromium/src/+/4875713 * 4831380: [task-attribution] Reland: Move to an implicit GCed task container model https://chromium-review.googlesource.com/c/chromium/src/+/4831380 * 4877868: Remove all gitignore entries for submodules https://chromium-review.googlesource.com/c/chromium/src/+/4877868 * 4824705: Set origin to commit for data: URLs https://chromium-review.googlesource.com/c/chromium/src/+/4824705 * chore: fixup patch indices * 4881382: Expose selection in WebFormControlElement as unsigned https://chromium-review.googlesource.com/c/chromium/src/+/4881382 * 4874216: Portals: Cancel drag-drop in predecessor before activation https://chromium-review.googlesource.com/c/chromium/src/+/4874216 * chore: bump chromium in DEPS to 119.0.6025.0 * chore: bump chromium in DEPS to 119.0.6027.0 * 4884489: Update gitignore to be explicit about directories https://chromium-review.googlesource.com/c/chromium/src/+/4884489 * 4881091: Add debug info about owner document's origin when inheriting https://chromium-review.googlesource.com/c/chromium/src/+/4881091 * chore: fixup patch indices * chore: bump chromium in DEPS to 119.0.6029.0 * chore: update patches * 4881091: Add debug info about owner document's origin when inheriting Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4881091 * 4831380: [task-attribution] Reland: Move to an implicit GCed task container model Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4831380 * 4866732: Extract document.title for installable checks Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4866732 * chore: link to crbug in message port test --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: John Kleinschmidt <jkleinsc@github.com>
|
|
Date: Wed, 15 Jul 2020 17:52:32 -0400
|
|
Subject: skip atk toolchain check
|
|
|
|
this patch is needed to work around the following gn error on
|
|
Linux arm/arm64:
|
|
|
|
ERROR at //build/config/linux/atk/BUILD.gn:13:1: Assertion failed.
|
|
|
|
assert(current_toolchain == default_toolchain)
|
|
|
|
^-----
|
|
|
|
See //ui/accessibility/BUILD.gn:297:20: which caused the file to be included.
|
|
|
|
configs += [ "//build/config/linux/atk" ]
|
|
|
|
^-------------------------
|
|
"//build/config/linux/atk" is only needed for accessibility unit tests
|
|
which we don't build
|
|
|
|
diff --git a/build/config/linux/atk/BUILD.gn b/build/config/linux/atk/BUILD.gn
|
|
index 239c3870a149a9c31d8458c5c6aeb543d80c2a6a..843f442a55ce866dc018de74c33d888cbffb8dd4 100644
|
|
--- a/build/config/linux/atk/BUILD.gn
|
|
+++ b/build/config/linux/atk/BUILD.gn
|
|
@@ -11,7 +11,7 @@ import("//build/config/ui.gni")
|
|
assert(!is_chromeos)
|
|
|
|
# These packages should _only_ be expected when building for a target.
|
|
-assert(current_toolchain == default_toolchain)
|
|
+#assert(current_toolchain == default_toolchain)
|
|
|
|
if (use_atk) {
|
|
assert(use_glib, "use_atk=true requires that use_glib=true")
|
|
diff --git a/build/config/linux/atspi2/BUILD.gn b/build/config/linux/atspi2/BUILD.gn
|
|
index d1629205c82a30eaddcd2cb5315978dad48bec02..92234b463a50c9f297964e3f366b65c444f4e6b2 100644
|
|
--- a/build/config/linux/atspi2/BUILD.gn
|
|
+++ b/build/config/linux/atspi2/BUILD.gn
|
|
@@ -6,7 +6,6 @@ import("//build/config/linux/pkg_config.gni")
|
|
import("//build/config/ui.gni")
|
|
|
|
# These packages should _only_ be expected when building for a target.
|
|
-assert(current_toolchain == default_toolchain)
|
|
|
|
if (use_atk) {
|
|
pkg_config("atspi2") {
|