2020-07-22 05:34:34 +00:00
|
|
|
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
|
2021-07-06 12:17:13 +00:00
|
|
|
index 92baff2a9b6eea1bcfaa53a9e70b4857b68cea77..8fd6031dda6afa42e9ed0742ccc4e71a93df7583 100644
|
2020-07-22 05:34:34 +00:00
|
|
|
--- a/build/config/linux/atk/BUILD.gn
|
|
|
|
|
+++ b/build/config/linux/atk/BUILD.gn
|
2021-07-06 12:17:13 +00:00
|
|
|
@@ -11,7 +11,7 @@ import("//build/config/ui.gni")
|
|
|
|
|
assert(!is_chromeos)
|
2020-07-22 05:34:34 +00:00
|
|
|
|
|
|
|
|
# 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")
|
2021-03-16 16:05:15 +00:00
|
|
|
diff --git a/build/config/linux/atspi2/BUILD.gn b/build/config/linux/atspi2/BUILD.gn
|
|
|
|
|
index 988a9956813617456ee1945de8e857d43543e411..e6e17e9e8f5ff99404b52c0a42d508f97c61e7fc 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") {
|
