Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3032)

Unified Diff: chrome/chrome_tests_unit.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 7adec38c9e056b734909c0a88def660d1e03f1c8..eebc438b6296dfc6bf45eeba37618f6d5eba9de6 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1919,6 +1919,11 @@
'browser/policy/proxy_policy_provider_unittest.cc',
],
}],
+ ['use_x11==1', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ ],
+ }],
['toolkit_uses_gtk == 1', {
'conditions': [
['selinux==0', {
@@ -1953,7 +1958,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',
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698