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

Unified Diff: content/content_browser.gypi

Issue 12374068: Make it possible to disable udev in linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unbreak mac Created 7 years, 1 month 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 | « content/browser/gamepad/gamepad_platform_data_fetcher.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f89c226f471f9fc01358af7c5a9608151356ef89..975c109e3e22c1c27aa154f71f301ab02424554f 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -392,10 +392,10 @@
'browser/devtools/worker_devtools_manager.h',
'browser/devtools/worker_devtools_message_filter.cc',
'browser/devtools/worker_devtools_message_filter.h',
- 'browser/device_monitor_linux.cc',
- 'browser/device_monitor_linux.h',
'browser/device_monitor_mac.h',
'browser/device_monitor_mac.mm',
+ 'browser/device_monitor_udev.cc',
+ 'browser/device_monitor_udev.h',
'browser/device_orientation/data_fetcher_impl_android.cc',
'browser/device_orientation/data_fetcher_impl_android.h',
'browser/device_orientation/data_fetcher_shared_memory.h',
@@ -1261,7 +1261,7 @@
'../ui/events/events.gyp:events',
],
}],
- ['OS!="win" and OS!="mac" and OS!="linux"', {
+ ['OS!="win" and OS!="mac" and (OS!="linux" or use_udev==0)', {
'sources': [
'browser/gamepad/gamepad_platform_data_fetcher.cc',
]
@@ -1414,10 +1414,22 @@
}],
['OS=="linux"', {
'dependencies': [
- '../build/linux/system.gyp:udev',
'../sandbox/sandbox.gyp:libc_urandom_override',
],
}],
+ ['use_udev == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:udev',
+ ],
+ }, {
+ 'sources!': [
+ 'browser/device_monitor_udev.cc',
+ 'browser/device_monitor_udev.h',
+ 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
+ 'browser/udev_linux.cc',
+ 'browser/udev_linux.h',
+ ],
+ }],
['OS=="linux" and use_aura==1', {
'dependencies': [
'../build/linux/system.gyp:fontconfig',
« no previous file with comments | « content/browser/gamepad/gamepad_platform_data_fetcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698