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

Unified Diff: third_party/libusb/libusb.gyp

Issue 467983002: Make udev target disappear on linux when use_udev==0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | « device/serial/serial.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libusb/libusb.gyp
diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp
index 9ea8af58968d35ffdd749b93b0d5a10fd2005e4d..02d319636d695d5780d7382e2583fe74362fafd9 100644
--- a/third_party/libusb/libusb.gyp
+++ b/third_party/libusb/libusb.gyp
@@ -53,17 +53,38 @@
}],
[ 'OS == "linux" or OS == "android"', {
'sources': [
- 'src/libusb/os/linux_udev.c',
'src/libusb/os/linux_usbfs.c',
'src/libusb/os/linux_usbfs.h',
],
'defines': [
- 'HAVE_LIBUDEV=1',
'OS_LINUX=1',
- 'USE_UDEV=1',
'_GNU_SOURCE=1',
],
}],
+ [ 'use_udev == 1 or OS == "android"', {
+ 'sources': [
+ 'src/libusb/os/linux_udev.c',
+ ],
+ 'defines': [
+ 'HAVE_LIBUDEV=1',
+ 'USE_UDEV=1',
+ ],
+ }],
+ [ 'OS == "linux" and use_udev == 0', {
+ 'sources': [
+ 'src/libusb/os/linux_netlink.c',
+ ],
+ 'defines': [
+ 'HAVE_LINUX_NETLINK_H',
+ ],
+ 'conditions': [
+ ['clang==1', {
+ 'cflags': [
+ '-Wno-pointer-sign',
+ ]
+ }]
+ ],
+ }],
[ 'OS == "mac"', {
'sources': [
'src/libusb/os/darwin_usb.c',
« no previous file with comments | « device/serial/serial.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698