webkit/tools/test_shell/test_shell.gypi - Issue 12213044: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/tools/test_shell/test_shell.gypi

Issue 12213044: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/tools/test_shell/test_shell.gypi

diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi

index ce17b8ec60818eabca8e8b714b22e7355b230346..c08bba8a0fd3dd0c40d4683b58cfbf2f38979f45 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'],

« no previous file with comments | « ui/ui_unittests.gypi ('k') | no next file » | no next file with comments »