diff options
| author | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 03:21:49 +0000 |
|---|---|---|
| committer | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 03:21:49 +0000 |
| commit | d7ee1313ff73d7d8878154c44466bf6b47d1dec4 (patch) | |
| tree | bd1e6bacc21355cbf0f91e08835d85fa2636215d /chrome/chrome_tests.gypi | |
| parent | cbeeffbdc79b5ef83cc23772f689ee0872214e0c (diff) | |
| download | chromium_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 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 33 |
1 files changed, 26 insertions, 7 deletions
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"', { |