bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix startup hang on Ubuntu 16.04.4 (issue #2424)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-04-13 21:21:17 -04:00
parent 64d86a7397
commit 0677d0d9de
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BUILD.gn
View File

@@ -118,6 +118,7 @@ if (is_clang) {
} }
if (is_linux) { if (is_linux) {
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//third_party/fontconfig/fontconfig.gni")
} }
if (is_mac) { if (is_mac) {
import("//build/config/mac/rules.gni") import("//build/config/mac/rules.gni")
@@ -148,6 +149,12 @@ if (is_clang) {
assert(!clang_use_chrome_plugins) 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) { if (is_mac) {
# Always generate dSYM files. The make_distrib script will fail if # Always generate dSYM files. The make_distrib script will fail if
# enable_dsyms=true is not explicitly set when is_official_build=false. # enable_dsyms=true is not explicitly set when is_official_build=false.

6
tools/gn_args.py
View File

@@ -256,8 +256,14 @@ def GetRequiredArgs():
if platform == 'linux': if platform == 'linux':
# Don't generate Chromium installer packages. This avoids GN dependency # Don't generate Chromium installer packages. This avoids GN dependency
# errors with CEF (see issue #2301). # 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 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': if platform == 'macosx':
# Always generate dSYM files. The make_distrib script will fail if # Always generate dSYM files. The make_distrib script will fail if
# enable_dsyms=true is not explicitly set when is_official_build=false. # enable_dsyms=true is not explicitly set when is_official_build=false.