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

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: rename device_monitor_linux.* to device_monitor_udev.* 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
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 1fc3c688523d5facc9631a1491f19083326aca08..31b214f4d624c31a3e1823b12cd6530269bd1632 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',
@@ -1242,7 +1242,7 @@
'../ui/events/events.gyp:events',
],
}],
- ['OS!="win" and OS!="mac" and OS!="linux"', {
+ ['OS!="linux" or use_udev==0', {
'sources': [
'browser/gamepad/gamepad_platform_data_fetcher.cc',
]
@@ -1397,10 +1397,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!': [
rjkroege 2013/11/18 22:32:19 I didn't provide adequate information. I meant you
Mostyn Bramley-Moore 2013/11/18 23:32:26 It might be a little confusing since there are oth
+ '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:dbus',

Powered by Google App Engine
This is Rietveld 408576698