diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 17:09:05 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 17:09:05 +0000 |
| commit | 1c9d5164099002cacb16404310209d055bbf04d5 (patch) | |
| tree | 31da55f03c88c12c4c7fa37980c27dc9991c2dba /third_party/libusb/libusb.gyp | |
| parent | 3900c1d9c7f26ab71cfcfb64469028715297b66f (diff) | |
| download | chromium_src-1c9d5164099002cacb16404310209d055bbf04d5.zip chromium_src-1c9d5164099002cacb16404310209d055bbf04d5.tar.gz chromium_src-1c9d5164099002cacb16404310209d055bbf04d5.tar.bz2 | |
Update libusb 1.0.9 to libusbx 1.0.16.
libusb 1.0.9 has serious deadlock bugs on Windows. libusbx is the rapid-development version of libusb and will be eventually merged into libusb.
BUG=223817
R=pfeldman@chromium.org
Review URL: https://codereview.chromium.org/19713005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libusb/libusb.gyp')
| -rw-r--r-- | third_party/libusb/libusb.gyp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp index 46e9e6f..f769ff1 100644 --- a/third_party/libusb/libusb.gyp +++ b/third_party/libusb/libusb.gyp @@ -9,15 +9,18 @@ 'type': 'static_library', 'sources': [ 'src/config.h', - 'src/libusb/libusb.h', - 'src/libusb/libusbi.h', 'src/libusb/core.c', 'src/libusb/descriptor.c', + 'src/libusb/hotplug.c', + 'src/libusb/hotplug.h', + 'src/libusb/interrupt.c', + 'src/libusb/interrupt.h', 'src/libusb/io.c', + 'src/libusb/libusb.h', + 'src/libusb/libusbi.h', 'src/libusb/sync.c', 'src/libusb/version.h', - 'src/libusb/interrupt.c', - 'src/libusb/interrupt.h', + 'src/libusb/version_nano.h', ], 'include_dirs': [ 'src', @@ -30,10 +33,9 @@ ], }, 'conditions': [ - [ 'OS == "linux" or OS == "android"', { + [ 'OS == "linux" or OS == "android" or OS == "mac"', { 'sources': [ - 'src/libusb/os/linux_usbfs.c', - 'src/libusb/os/linux_usbfs.h', + 'src/libusb/os/poll_posix.c', 'src/libusb/os/poll_posix.h', 'src/libusb/os/threads_posix.c', 'src/libusb/os/threads_posix.h', @@ -43,19 +45,40 @@ 'HAVE_GETTIMEOFDAY=1', 'HAVE_POLL_H=1', 'HAVE_SYS_TIME_H=1', - 'LIBUSB_DESCRIBE="1.0.9"', - 'OS_LINUX=1', + 'LIBUSB_DESCRIBE="1.0.16"', 'POLL_NFDS_TYPE=nfds_t', 'THREADS_POSIX=1', + ], + }], + [ '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', ], }], - ['OS == "win"', { + [ 'OS == "mac"', { + 'sources': [ + 'src/libusb/os/darwin_usb.c', + 'src/libusb/os/darwin_usb.h', + ], + 'defines': [ + 'OS_DARWIN=1', + ], + }], + [ 'OS == "win"', { 'sources': [ 'src/libusb/os/poll_windows.c', 'src/libusb/os/poll_windows.h', 'src/libusb/os/threads_windows.c', 'src/libusb/os/threads_windows.h', + 'src/libusb/os/windows_common.h', 'src/libusb/os/windows_usb.c', 'src/libusb/os/windows_usb.h', 'src/msvc/config.h', @@ -67,31 +90,8 @@ ], 'include_dirs': [ 'src/msvc', - ], - 'defines': [ - 'DDKBUILD=1', ] }], - ['OS == "mac"', { - 'sources': [ - 'src/libusb/os/darwin_usb.c', - 'src/libusb/os/darwin_usb.h', - 'src/libusb/os/poll_posix.h', - 'src/libusb/os/threads_posix.c', - 'src/libusb/os/threads_posix.h', - ], - 'defines': [ - 'DEFAULT_VISIBILITY=', - 'HAVE_GETTIMEOFDAY=1', - 'HAVE_POLL_H=1', - 'HAVE_SYS_TIME_H=1', - 'LIBUSB_DESCRIBE="1.0.9"', - 'OS_DARWIN=1', - 'POLL_NFDS_TYPE=nfds_t', - 'THREADS_POSIX=1', - '_GNU_SOURCE=1', - ], - }], ], }, ], |