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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 12385071: Make it possible to disable dbus on linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: copyright header date fix 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_browser_ui.gypi ('k') | content/browser/geolocation/empty_device_data_provider.cc » ('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 19af4615620b782e3459e36b8a211496f5e5bfce..9a6df7266e2dd336008dbaed99c49e96a577c78b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1972,11 +1972,15 @@
}],
],
}],
+ ['use_dbus==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ '../dbus/dbus.gyp:dbus_test_support',
+ ],
+ }],
],
'dependencies': [
- '../build/linux/system.gyp:dbus',
'../build/linux/system.gyp:gtk',
- '../dbus/dbus.gyp:dbus_test_support',
],
'sources!': [
'browser/printing/print_job_unittest.cc',
@@ -1998,7 +2002,7 @@
'browser/password_manager/native_backend_gnome_x_unittest.cc',
],
}],
- ['OS=="linux" and use_aura==1', {
+ ['OS=="linux" and use_aura==1 and use_dbus==0', {
'dependencies': [
'../build/linux/system.gyp:dbus',
'../dbus/dbus.gyp:dbus_test_support',
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | content/browser/geolocation/empty_device_data_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698