16f459228b
Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Jeremy Rose <jeremya@chromium.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 51b6d33aab3c212ffab8aa656b24ff07a9efc25f..0583a09f1711782a039aa4944e56ab03b04af811 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") {
|