summaryrefslogtreecommitdiffstats
path: root/build/all.gyp
diff options
context:
space:
mode:
authorbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:21:49 +0000
committerbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:21:49 +0000
commitd7ee1313ff73d7d8878154c44466bf6b47d1dec4 (patch)
treebd1e6bacc21355cbf0f91e08835d85fa2636215d /build/all.gyp
parentcbeeffbdc79b5ef83cc23772f689ee0872214e0c (diff)
downloadchromium_src-d7ee1313ff73d7d8878154c44466bf6b47d1dec4.zip
chromium_src-d7ee1313ff73d7d8878154c44466bf6b47d1dec4.tar.gz
chromium_src-d7ee1313ff73d7d8878154c44466bf6b47d1dec4.tar.bz2
Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1.
Some non-gtk X11 builds need it. BUG=None Review URL: https://chromiumcodereview.appspot.com/12213044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
-rw-r--r--build/all.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index c317a05..fa947f1 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -108,10 +108,14 @@
}],
],
}],
+ ['use_x11==1', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
+ ],
+ }],
['toolkit_uses_gtk==1', {
'dependencies': [
'../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
],
}],
['OS=="win"', {