Linux: Fix ATK assertion error when generating ARM build config.

This commit is contained in:
Marshall Greenblatt 2020-11-18 15:52:37 -05:00
parent d2c884da86
commit 7d1d3c0206
2 changed files with 18 additions and 0 deletions

View File

@ -524,5 +524,10 @@ patches = [
# Windows/Linux: Fix scrolling in popup lists with high-dpi.
# https://crrev.com/97514ca869
'name': 'webkit_widget_base_2444320',
},
{
# Linux: Fix ATK assertion error when generating ARM build config.
# https://bugs.chromium.org/p/chromium/issues/detail?id=1123214
'name': 'linux_atk_1123214',
}
]

View File

@ -0,0 +1,13 @@
diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn
index aad2efa60d6c..fe9f30b82c22 100644
--- build/config/linux/atk/BUILD.gn
+++ build/config/linux/atk/BUILD.gn
@@ -10,7 +10,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")