53 files changed, 90 insertions, 49 deletions
diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp
index 6c5ffd4..7fb3331 100644
--- a/third_party/libusb/libusb.gyp
+++ b/third_party/libusb/libusb.gyp
@@ -3,63 +3,90 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'use_system_libusb%': 0,
+    'required_libusb_version': '1.0.0',
+  },
   'targets': [
     {
       'target_name': 'libusb',
-      'type': '<(library)',
-      'sources': [
-        'libusb/core.c',
-        'libusb/descriptor.c',
-        'libusb/io.c',
-        'libusb/sync.c',
-      ],
-      'include_dirs': [
-        '.',
-        'libusb',
-        'libusb/os',
-      ],
       'conditions': [
-        [ 'OS == "linux"', {
-          'sources': [
-            'libusb/os/linux_usbfs.c',
-            'libusb/os/threads_posix.c',
-          ],
-          'defines': [
-            'DEFAULT_VISIBILITY=',
-            'HAVE_POLL_H=1',
-            'HAVE_SYS_TIME_H=1',
-            'OS_LINUX=1',
-            'POLL_NFDS_TYPE=nfds_t',
-            'THREADS_POSIX=1',
-            '_GNU_SOURCE=1',
-          ],
-        }],
-        [ 'OS == "win"', {
+        ['OS == "linux" and use_system_libusb', {
+          'type': 'none',
+          'direct_dependent_settings': {
+            'defines': [
+              'USE_SYSTEM_LIBUSB',
+            ],
+            'cflags': [
+              '<!@(pkg-config --atleast-version=<(required_libusb_version) libusb-1.0)',
+              '<!@(pkg-config --cflags libusb-1.0)',
+            ],
+            'link_settings': {
+              'ldflags': [
+                '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
+              ],
+              'libraries': [
+                '<!@(pkg-config --libs-only-l libusb-1.0)',
+              ],
+            },
+          },
+        }, {
+          'type': '<(library)',
           'sources': [
-            'libusb/os/poll_windows.c',
-            'libusb/os/threads_windows.c',
-            'libusb/os/windows_usb.c',
-          ],
-          'include_dirs!': [
-            '.',
+            'src/libusb/core.c',
+            'src/libusb/descriptor.c',
+            'src/libusb/io.c',
+            'src/libusb/sync.c',
           ],
           'include_dirs': [
-            'msvc',
-          ],
-        }],
-        [ 'OS == "mac"', {
-          'sources': [
-            'libusb/os/darwin_usb.c',
-            'libusb/os/threads_posix.c',
+            'src',
+            'src/libusb',
+            'src/libusb/os',
           ],
-          'defines': [
-            'DEFAULT_VISIBILITY=',
-            'HAVE_POLL_H=1',
-            'HAVE_SYS_TIME_H=1',
-            'OS_DARWIN=1',
-            'POLL_NFDS_TYPE=nfds_t',
-            'THREADS_POSIX=1',
-            '_GNU_SOURCE=1',
+          'conditions': [
+            [ 'OS == "linux"', {
+              'sources': [
+                'src/libusb/os/linux_usbfs.c',
+                'src/libusb/os/threads_posix.c',
+              ],
+              'defines': [
+                'DEFAULT_VISIBILITY=',
+                'HAVE_POLL_H=1',
+                'HAVE_SYS_TIME_H=1',
+                'OS_LINUX=1',
+                'POLL_NFDS_TYPE=nfds_t',
+                'THREADS_POSIX=1',
+                '_GNU_SOURCE=1',
+              ],
+            }],
+            ['OS == "win"', {
+              'sources': [
+                'src/libusb/os/poll_windows.c',
+                'src/libusb/os/threads_windows.c',
+                'src/libusb/os/windows_usb.c',
+              ],
+              'include_dirs!': [
+                'src',
+              ],
+              'include_dirs': [
+                'src/msvc',
+              ],
+            }],
+            ['OS == "mac"', {
+              'sources': [
+                'src/libusb/os/darwin_usb.c',
+                'src/libusb/os/threads_posix.c',
+              ],
+              'defines': [
+                'DEFAULT_VISIBILITY=',
+                'HAVE_POLL_H=1',
+                'HAVE_SYS_TIME_H=1',
+                'OS_DARWIN=1',
+                'POLL_NFDS_TYPE=nfds_t',
+                'THREADS_POSIX=1',
+                '_GNU_SOURCE=1',
+              ],
+            }],
           ],
         }],
       ],
diff --git a/third_party/libusb/libusb.h b/third_party/libusb/libusb.h
new file mode 100644
index 0000000..0486653
--- /dev/null
+++ b/third_party/libusb/libusb.h
@@ -0,0 +1,14 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_LIBUSB_LIBUSB_H_
+#define THIRD_PARTY_LIBUSB_LIBUSB_H_
+
+#if defined(USE_SYSTEM_LIBUSB)
+#include <libusb.h>
+#else
+#include "third_party/libusb/src/libusb/libusb.h"
+#endif
+
+#endif  // THIRD_PARTY_LIBUSB_LIBUSB_H_
diff --git a/third_party/libusb/AUTHORS b/third_party/libusb/src/AUTHORS
index 9ced4a9..9ced4a9 100644
--- a/third_party/libusb/AUTHORS
+++ b/third_party/libusb/src/AUTHORS
diff --git a/third_party/libusb/COPYING b/third_party/libusb/src/COPYING
index 5ab7695..5ab7695 100644
--- a/third_party/libusb/COPYING
+++ b/third_party/libusb/src/COPYING
diff --git a/third_party/libusb/INSTALL b/third_party/libusb/src/INSTALL
index 5458714..5458714 100644
--- a/third_party/libusb/INSTALL
+++ b/third_party/libusb/src/INSTALL
diff --git a/third_party/libusb/Makefile.am b/third_party/libusb/src/Makefile.am
index f59b8c3..f59b8c3 100644
--- a/third_party/libusb/Makefile.am
+++ b/third_party/libusb/src/Makefile.am
diff --git a/third_party/libusb/NEWS b/third_party/libusb/src/NEWS
index 42c232c..42c232c 100644
--- a/third_party/libusb/NEWS
+++ b/third_party/libusb/src/NEWS
diff --git a/third_party/libusb/PORTING b/third_party/libusb/src/PORTING
index 7070784..7070784 100644
--- a/third_party/libusb/PORTING
+++ b/third_party/libusb/src/PORTING
diff --git a/third_party/libusb/README b/third_party/libusb/src/README
index c5dabd7..c5dabd7 100644
--- a/third_party/libusb/README
+++ b/third_party/libusb/src/README
diff --git a/third_party/libusb/THANKS b/third_party/libusb/src/THANKS
index d926126..d926126 100644
--- a/third_party/libusb/THANKS
+++ b/third_party/libusb/src/THANKS
diff --git a/third_party/libusb/TODO b/third_party/libusb/src/TODO
index 6c162a3..6c162a3 100644
--- a/third_party/libusb/TODO
+++ b/third_party/libusb/src/TODO
diff --git a/third_party/libusb/autogen.sh b/third_party/libusb/src/autogen.sh
index d5c6a19..d5c6a19 100755
--- a/third_party/libusb/autogen.sh
+++ b/third_party/libusb/src/autogen.sh
diff --git a/third_party/libusb/config.h b/third_party/libusb/src/config.h
index 8b13789..8b13789 100644
--- a/third_party/libusb/config.h
+++ b/third_party/libusb/src/config.h
diff --git a/third_party/libusb/configure.ac b/third_party/libusb/src/configure.ac
index 8020907..8020907 100644
--- a/third_party/libusb/configure.ac
+++ b/third_party/libusb/src/configure.ac
diff --git a/third_party/libusb/doc/Makefile.am b/third_party/libusb/src/doc/Makefile.am
index ac5b189..ac5b189 100644
--- a/third_party/libusb/doc/Makefile.am
+++ b/third_party/libusb/src/doc/Makefile.am
diff --git a/third_party/libusb/doc/doxygen.cfg.in b/third_party/libusb/src/doc/doxygen.cfg.in
index 128e1de..128e1de 100644
--- a/third_party/libusb/doc/doxygen.cfg.in
+++ b/third_party/libusb/src/doc/doxygen.cfg.in
diff --git a/third_party/libusb/examples/Makefile.am b/third_party/libusb/src/examples/Makefile.am
index 846af15..846af15 100644
--- a/third_party/libusb/examples/Makefile.am
+++ b/third_party/libusb/src/examples/Makefile.am
diff --git a/third_party/libusb/examples/dpfp.c b/third_party/libusb/src/examples/dpfp.c
index 1b3c3a4..1b3c3a4 100644
--- a/third_party/libusb/examples/dpfp.c
+++ b/third_party/libusb/src/examples/dpfp.c
diff --git a/third_party/libusb/examples/dpfp_threaded.c b/third_party/libusb/src/examples/dpfp_threaded.c
index c3d314d..c3d314d 100644
--- a/third_party/libusb/examples/dpfp_threaded.c
+++ b/third_party/libusb/src/examples/dpfp_threaded.c
diff --git a/third_party/libusb/examples/lsusb.c b/third_party/libusb/src/examples/lsusb.c
index 6ab8917..6ab8917 100644
--- a/third_party/libusb/examples/lsusb.c
+++ b/third_party/libusb/src/examples/lsusb.c
diff --git a/third_party/libusb/libusb-1.0.pc.in b/third_party/libusb/src/libusb-1.0.pc.in
index 81b56ec..81b56ec 100644
--- a/third_party/libusb/libusb-1.0.pc.in
+++ b/third_party/libusb/src/libusb-1.0.pc.in
diff --git a/third_party/libusb/libusb/Makefile.am b/third_party/libusb/src/libusb/Makefile.am
index 22661dcc..22661dcc 100644
--- a/third_party/libusb/libusb/Makefile.am
+++ b/third_party/libusb/src/libusb/Makefile.am
diff --git a/third_party/libusb/libusb/core.c b/third_party/libusb/src/libusb/core.c
index a91c77b..a91c77b 100644
--- a/third_party/libusb/libusb/core.c
+++ b/third_party/libusb/src/libusb/core.c
diff --git a/third_party/libusb/libusb/descriptor.c b/third_party/libusb/src/libusb/descriptor.c
index e358e9e..e358e9e 100644
--- a/third_party/libusb/libusb/descriptor.c
+++ b/third_party/libusb/src/libusb/descriptor.c
diff --git a/third_party/libusb/libusb/io.c b/third_party/libusb/src/libusb/io.c
index 51b641d..51b641d 100644
--- a/third_party/libusb/libusb/io.c
+++ b/third_party/libusb/src/libusb/io.c
diff --git a/third_party/libusb/libusb/libusb-1.0.def b/third_party/libusb/src/libusb/libusb-1.0.def
index 96abd17..96abd17 100644
--- a/third_party/libusb/libusb/libusb-1.0.def
+++ b/third_party/libusb/src/libusb/libusb-1.0.def
diff --git a/third_party/libusb/libusb/libusb-1.0.rc b/third_party/libusb/src/libusb/libusb-1.0.rc
index 0171f17..0171f17 100644
--- a/third_party/libusb/libusb/libusb-1.0.rc
+++ b/third_party/libusb/src/libusb/libusb-1.0.rc
diff --git a/third_party/libusb/libusb/libusb.h b/third_party/libusb/src/libusb/libusb.h
index beff229..beff229 100644
--- a/third_party/libusb/libusb/libusb.h
+++ b/third_party/libusb/src/libusb/libusb.h
diff --git a/third_party/libusb/libusb/libusbi.h b/third_party/libusb/src/libusb/libusbi.h
index fe9b7af..fe9b7af 100644
--- a/third_party/libusb/libusb/libusbi.h
+++ b/third_party/libusb/src/libusb/libusbi.h
diff --git a/third_party/libusb/libusb/os/darwin_usb.c b/third_party/libusb/src/libusb/os/darwin_usb.c
index 0af4e3c..0af4e3c 100644
--- a/third_party/libusb/libusb/os/darwin_usb.c
+++ b/third_party/libusb/src/libusb/os/darwin_usb.c
diff --git a/third_party/libusb/libusb/os/darwin_usb.h b/third_party/libusb/src/libusb/os/darwin_usb.h
index 59d0a69..59d0a69 100644
--- a/third_party/libusb/libusb/os/darwin_usb.h
+++ b/third_party/libusb/src/libusb/os/darwin_usb.h
diff --git a/third_party/libusb/libusb/os/linux_usbfs.c b/third_party/libusb/src/libusb/os/linux_usbfs.c
index 2b81189..2b81189 100644
--- a/third_party/libusb/libusb/os/linux_usbfs.c
+++ b/third_party/libusb/src/libusb/os/linux_usbfs.c
diff --git a/third_party/libusb/libusb/os/linux_usbfs.h b/third_party/libusb/src/libusb/os/linux_usbfs.h
index 93e7f31..93e7f31 100644
--- a/third_party/libusb/libusb/os/linux_usbfs.h
+++ b/third_party/libusb/src/libusb/os/linux_usbfs.h
diff --git a/third_party/libusb/libusb/os/poll_posix.h b/third_party/libusb/src/libusb/os/poll_posix.h
index 0e5e7f5b..0e5e7f5b 100644
--- a/third_party/libusb/libusb/os/poll_posix.h
+++ b/third_party/libusb/src/libusb/os/poll_posix.h
diff --git a/third_party/libusb/libusb/os/poll_windows.c b/third_party/libusb/src/libusb/os/poll_windows.c
index c997c81..c997c81 100644
--- a/third_party/libusb/libusb/os/poll_windows.c
+++ b/third_party/libusb/src/libusb/os/poll_windows.c
diff --git a/third_party/libusb/libusb/os/poll_windows.h b/third_party/libusb/src/libusb/os/poll_windows.h
index 76bab0f..76bab0f 100644
--- a/third_party/libusb/libusb/os/poll_windows.h
+++ b/third_party/libusb/src/libusb/os/poll_windows.h
diff --git a/third_party/libusb/libusb/os/threads_posix.c b/third_party/libusb/src/libusb/os/threads_posix.c
index 435b873..435b873 100644
--- a/third_party/libusb/libusb/os/threads_posix.c
+++ b/third_party/libusb/src/libusb/os/threads_posix.c
diff --git a/third_party/libusb/libusb/os/threads_posix.h b/third_party/libusb/src/libusb/os/threads_posix.h
index 9752208..9752208 100644
--- a/third_party/libusb/libusb/os/threads_posix.h
+++ b/third_party/libusb/src/libusb/os/threads_posix.h
diff --git a/third_party/libusb/libusb/os/threads_windows.c b/third_party/libusb/src/libusb/os/threads_windows.c
index 8a29920..8a29920 100644
--- a/third_party/libusb/libusb/os/threads_windows.c
+++ b/third_party/libusb/src/libusb/os/threads_windows.c
diff --git a/third_party/libusb/libusb/os/threads_windows.h b/third_party/libusb/src/libusb/os/threads_windows.h
index 7bb144a..7bb144a 100644
--- a/third_party/libusb/libusb/os/threads_windows.h
+++ b/third_party/libusb/src/libusb/os/threads_windows.h
diff --git a/third_party/libusb/libusb/os/windows_usb.c b/third_party/libusb/src/libusb/os/windows_usb.c
index 68216db..68216db 100644
--- a/third_party/libusb/libusb/os/windows_usb.c
+++ b/third_party/libusb/src/libusb/os/windows_usb.c
diff --git a/third_party/libusb/libusb/os/windows_usb.h b/third_party/libusb/src/libusb/os/windows_usb.h
index 6dbfaf5..6dbfaf5 100644
--- a/third_party/libusb/libusb/os/windows_usb.h
+++ b/third_party/libusb/src/libusb/os/windows_usb.h
diff --git a/third_party/libusb/libusb/sync.c b/third_party/libusb/src/libusb/sync.c
index 8eed47b..8eed47b 100644
--- a/third_party/libusb/libusb/sync.c
+++ b/third_party/libusb/src/libusb/sync.c
diff --git a/third_party/libusb/libusb/version.h b/third_party/libusb/src/libusb/version.h
index 08e2c872..08e2c872 100644
--- a/third_party/libusb/libusb/version.h
+++ b/third_party/libusb/src/libusb/version.h
diff --git a/third_party/libusb/msvc/config.h b/third_party/libusb/src/msvc/config.h
index 9ac6134..9ac6134 100644
--- a/third_party/libusb/msvc/config.h
+++ b/third_party/libusb/src/msvc/config.h
diff --git a/third_party/libusb/msvc/ddk_build.cmd b/third_party/libusb/src/msvc/ddk_build.cmd
index fa79b82..fa79b82 100644
--- a/third_party/libusb/msvc/ddk_build.cmd
+++ b/third_party/libusb/src/msvc/ddk_build.cmd
diff --git a/third_party/libusb/msvc/inttypes.h b/third_party/libusb/src/msvc/inttypes.h
index 289bb50..289bb50 100644
--- a/third_party/libusb/msvc/inttypes.h
+++ b/third_party/libusb/src/msvc/inttypes.h
diff --git a/third_party/libusb/msvc/libusb.dsw b/third_party/libusb/src/msvc/libusb.dsw
index e4de346..e4de346 100644
--- a/third_party/libusb/msvc/libusb.dsw
+++ b/third_party/libusb/src/msvc/libusb.dsw
diff --git a/third_party/libusb/msvc/libusb_dll.dsp b/third_party/libusb/src/msvc/libusb_dll.dsp
index 4754a531..4754a531 100644
--- a/third_party/libusb/msvc/libusb_dll.dsp
+++ b/third_party/libusb/src/msvc/libusb_dll.dsp
diff --git a/third_party/libusb/msvc/libusb_sources b/third_party/libusb/src/msvc/libusb_sources
index 8e8e65c..8e8e65c 100644
--- a/third_party/libusb/msvc/libusb_sources
+++ b/third_party/libusb/src/msvc/libusb_sources
diff --git a/third_party/libusb/msvc/libusb_static.dsp b/third_party/libusb/src/msvc/libusb_static.dsp
index f866a63..f866a63 100644
--- a/third_party/libusb/msvc/libusb_static.dsp
+++ b/third_party/libusb/src/msvc/libusb_static.dsp
diff --git a/third_party/libusb/msvc/lsusb_sources b/third_party/libusb/src/msvc/lsusb_sources
index dbfefbb..dbfefbb 100644
--- a/third_party/libusb/msvc/lsusb_sources
+++ b/third_party/libusb/src/msvc/lsusb_sources
diff --git a/third_party/libusb/msvc/stdint.h b/third_party/libusb/src/msvc/stdint.h
index 00988d9..00988d9 100644
--- a/third_party/libusb/msvc/stdint.h
+++ b/third_party/libusb/src/msvc/stdint.h