ui/ui_unittests.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: ui/ui_unittests.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: ui/ui_unittests.gypi

diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi

index e66680903a41d5dbf72f406d63bb33f0bf9c7bfd..9dd994f1907331d8bb31a5a32a1155630b96328c 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',

« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »