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 /webkit/tools/test_shell/test_shell.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 'webkit/tools/test_shell/test_shell.gypi')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
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'], |