summaryrefslogtreecommitdiffstats
path: root/app/app_base.gypi
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 20:50:14 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 20:50:14 +0000
commitfaa223fba8ebc8b664d63fdaabdf2f2e088a1f16 (patch)
treebedb8067c80e556be606b6dff196f1e58950b223 /app/app_base.gypi
parent9db1531af8305e917ff5bb02657bc9130b073b53 (diff)
downloadchromium_src-faa223fba8ebc8b664d63fdaabdf2f2e088a1f16.zip
chromium_src-faa223fba8ebc8b664d63fdaabdf2f2e088a1f16.tar.gz
chromium_src-faa223fba8ebc8b664d63fdaabdf2f2e088a1f16.tar.bz2
Revert 45065 - Relanding this. Originally landed as http://codereview.chromium.org/1001003 but reverted due to reliability crashes.
Relanding so I can see what those crashes are. Please do not revert without informing me. BUG=none TEST=none Review URL: http://codereview.chromium.org/1655010 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/1715001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_base.gypi')
-rw-r--r--app/app_base.gypi3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index c89dcb8..802a0d2 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -185,6 +185,9 @@
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
+ # font_gtk.cc uses fontconfig.
+ # TODO(evanm): I think this is wrong; it should just use GTK.
+ '../build/linux/system.gyp:fontconfig',
'../build/linux/system.gyp:gtk',
'../build/linux/system.gyp:x11',
],