From 0677d0d9debc34503c16b8797949704e53924007 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 13 Apr 2018 21:21:17 -0400
Subject: [PATCH] Linux: Fix startup hang on Ubuntu 16.04.4 (issue #2424)

---
 BUILD.gn         | 7 +++++++
 tools/gn_args.py | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index 3cf62ac79..bd92b9bd4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -118,6 +118,7 @@ if (is_clang) {
 }
 if (is_linux) {
   import("//build/config/linux/pkg_config.gni")
+  import("//third_party/fontconfig/fontconfig.gni")
 }
 if (is_mac) {
   import("//build/config/mac/rules.gni")
@@ -148,6 +149,12 @@ if (is_clang) {
   assert(!clang_use_chrome_plugins)
 }
 
+if (is_linux) {
+  # Use system fontconfig. This avoids a startup hang on Ubuntu 16.04.4 (see
+  # issue #2424).
+  assert(!use_bundled_fontconfig)
+}
+
 if (is_mac) {
   # Always generate dSYM files. The make_distrib script will fail if
   # enable_dsyms=true is not explicitly set when is_official_build=false.
diff --git a/tools/gn_args.py b/tools/gn_args.py
index 8658d345d..620b3612e 100644
--- a/tools/gn_args.py
+++ b/tools/gn_args.py
@@ -256,8 +256,14 @@ def GetRequiredArgs():
   if platform == 'linux':
     # Don't generate Chromium installer packages. This avoids GN dependency
     # errors with CEF (see issue #2301).
+    # Due to the way this variable is declared in chrome/installer/BUILD.gn it
+    # can't be enforced by assert().
     result['enable_linux_installer'] = False
 
+    # Use system fontconfig. This avoids a startup hang on Ubuntu 16.04.4 (see
+    # issue #2424).
+    result['use_bundled_fontconfig'] = False
+
   if platform == 'macosx':
     # Always generate dSYM files. The make_distrib script will fail if
     # enable_dsyms=true is not explicitly set when is_official_build=false.