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

5 files changed, 46 insertions, 11 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"', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 95b2d66..684f5a1 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -114,7 +114,7 @@
             },
           },
         },],
-        ['use_x11 == 1', {
+        ['use_x11==1', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
@@ -259,10 +259,14 @@
         'test/ppapi/ppapi_interactive_browsertest.cc',
       ],
       'conditions': [
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
@@ -568,10 +572,14 @@
         'test/webdriver/webdriver_util_mac.mm',
       ],
       'conditions': [
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'test/webdriver/keycode_text_conversion_x.cc',
@@ -1687,7 +1695,6 @@
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
@@ -1906,10 +1913,14 @@
             'app/chrome_version.rc.version',
           ],
         }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
@@ -2067,10 +2078,14 @@
             'test/perf/mach_ports_test.cc',
           ],
         }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
@@ -2504,10 +2519,14 @@
             '../components/visitedlink/test/visitedlink_perftest.cc',
           ],
           'conditions': [
+            ['use_x11==1', {
+              'dependencies': [
+                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+              ],
+            }],
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
-                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
             ['OS=="win"', {
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index e0eb274..be8b452 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1915,6 +1915,11 @@
             'browser/policy/proxy_policy_provider_unittest.cc',
           ],
         }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'conditions': [
             ['selinux==0', {
@@ -1949,7 +1954,6 @@
             '../build/linux/system.gyp:dbus',
             '../build/linux/system.gyp:gtk',
             '../dbus/dbus.gyp:dbus_test_support',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'browser/printing/print_job_unittest.cc',
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',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index ce17b8e..c08bba8 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -143,11 +143,15 @@
                 'copy_npapi_test_plugin',
               ],
             }],
+            ['use_x11==1', {
+              'dependencies': [
+                '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+              ],
+            }],
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 'test_shell_resources',
                 '<(DEPTH)/build/linux/system.gyp:gtk',
-                '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
               # for:  test_shell_gtk.cc
               'cflags': ['-Wno-multichar'],