content/content_browser.gypi - Issue 12385071: Make it possible to disable dbus on linux

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: content/content_browser.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:

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index 4032dda06d28d339d6f41fc0efb143be572efc22..66aeb14bdca42c36f30b248db0a569625f87041f 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -588,6 +588,7 @@

'browser/plugin_service_impl.h',

'browser/power_save_blocker_android.cc',

'browser/power_save_blocker_chromeos.cc',

+ 'browser/power_save_blocker_empty.cc',

'browser/power_save_blocker_impl.cc',

'browser/power_save_blocker_impl.h',

'browser/power_save_blocker_linux.cc',

@@ -1080,6 +1081,23 @@

}],

+ ['OS=="linux" and use_dbus==0', {

+ 'sources!': [

+ 'browser/power_save_blocker_linux.cc',

+ 'browser/geolocation/wifi_data_provider_linux.cc',

+ ],

+ 'dependencies!': [

+ '../build/linux/system.gyp:dbus',

+ '../dbus/dbus.gyp:dbus',

+ ],

+ }],

+ ['OS=="win" or OS=="mac" or (OS=="linux" and use_dbus==1)', {

+ 'sources!': [

+ 'browser/geolocation/empty_device_data_provider.cc',

+ 'browser/geolocation/empty_device_data_provider.h',

+ 'browser/power_save_blocker_empty.cc',

+ ],

+ }],

['OS=="linux" and use_aura==1', {

'dependencies': [

'../build/linux/system.gyp:dbus',

« no previous file with comments | « content/browser/power_save_blocker_empty.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »