summaryrefslogtreecommitdiffstats
path: root/ui/ui_unittests.gypi
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 /ui/ui_unittests.gypi
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 'ui/ui_unittests.gypi')
-rw-r--r--ui/ui_unittests.gypi6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index e666809..9dd994f 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -221,7 +221,6 @@
['use_glib == 1', {
'dependencies': [
'../build/linux/system.gyp:pangocairo',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
'conditions': [
['linux_use_tcmalloc==1', {
@@ -236,6 +235,11 @@
}],
],
}],
+ ['use_x11==1', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ ],
+ }],
['toolkit_uses_gtk == 1', {
'sources': [
'base/dragdrop/gtk_dnd_util_unittest.cc',