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

Issue 10332075: Adding use_system_libusb option for third_party/libusb (Closed)

Created:
8 years, 7 months ago by Garret Kelly
Modified:
8 years, 7 months ago
CC:
chromium-reviews
Visibility:
Public.

Description

Adding use_system_libusb option for third_party/libusb There are build and distribution configurations under which packaged libraries cannot be included. The use_system_libusb option allows these platforms (Linux, currently) to use the pre-installed libusb. BUG=124803 TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136127 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136421

Patch Set 1 #

Patch Set 2 : Fixing license check. #

Total comments: 4

Patch Set 3 : Review changes. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+47 lines, -21972 lines) Patch
M chrome/browser/usb/usb_device.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/usb/usb_device.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/usb/usb_service.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/usb/usb_service.cc View 1 2 2 chunks +2 lines, -2 lines 0 comments Download
D third_party/libusb/AUTHORS View 1 chunk +0 lines, -24 lines 0 comments Download
D third_party/libusb/COPYING View 1 chunk +0 lines, -504 lines 0 comments Download
D third_party/libusb/INSTALL View 1 chunk +0 lines, -234 lines 0 comments Download
D third_party/libusb/Makefile.am View 1 chunk +0 lines, -28 lines 0 comments Download
D third_party/libusb/NEWS View 1 chunk +0 lines, -56 lines 0 comments Download
D third_party/libusb/PORTING View 1 chunk +0 lines, -95 lines 0 comments Download
D third_party/libusb/README View 1 chunk +0 lines, -23 lines 0 comments Download
D third_party/libusb/THANKS View 1 chunk +0 lines, -8 lines 0 comments Download
D third_party/libusb/TODO View 1 chunk +0 lines, -9 lines 0 comments Download
D third_party/libusb/autogen.sh View 1 chunk +0 lines, -12 lines 0 comments Download
D third_party/libusb/config.h View 1 chunk +0 lines, -1 line 0 comments Download
D third_party/libusb/configure.ac View 1 chunk +0 lines, -198 lines 0 comments Download
D third_party/libusb/doc/Makefile.am View 1 chunk +0 lines, -10 lines 0 comments Download
D third_party/libusb/doc/doxygen.cfg.in View 1 chunk +0 lines, -1294 lines 0 comments Download
D third_party/libusb/examples/Makefile.am View 1 chunk +0 lines, -21 lines 0 comments Download
D third_party/libusb/examples/dpfp.c View 1 chunk +0 lines, -507 lines 0 comments Download
D third_party/libusb/examples/dpfp_threaded.c View 1 chunk +0 lines, -545 lines 0 comments Download
D third_party/libusb/examples/lsusb.c View 1 chunk +0 lines, -64 lines 0 comments Download
A third_party/libusb/libusb.h View 1 chunk +14 lines, -0 lines 0 comments Download
M third_party/libusb/libusb.gyp View 1 2 1 chunk +74 lines, -49 lines 0 comments Download
D third_party/libusb/libusb-1.0.pc.in View 1 chunk +0 lines, -12 lines 0 comments Download
D third_party/libusb/libusb/Makefile.am View 1 chunk +0 lines, -40 lines 0 comments Download
D third_party/libusb/libusb/core.c View 1 chunk +0 lines, -1781 lines 0 comments Download
D third_party/libusb/libusb/descriptor.c View 1 chunk +0 lines, -730 lines 0 comments Download
D third_party/libusb/libusb/io.c View 1 chunk +0 lines, -2445 lines 0 comments Download
D third_party/libusb/libusb/libusb.h View 1 chunk +0 lines, -1401 lines 0 comments Download
D third_party/libusb/libusb/libusb-1.0.def View 1 chunk +0 lines, -118 lines 0 comments Download
D third_party/libusb/libusb/libusb-1.0.rc View 1 chunk +0 lines, -60 lines 0 comments Download
D third_party/libusb/libusb/libusbi.h View 1 chunk +0 lines, -889 lines 0 comments Download
D third_party/libusb/libusb/os/darwin_usb.h View 1 chunk +0 lines, -169 lines 0 comments Download
D third_party/libusb/libusb/os/darwin_usb.c View 1 chunk +0 lines, -1751 lines 0 comments Download
D third_party/libusb/libusb/os/linux_usbfs.h View 1 chunk +0 lines, -138 lines 0 comments Download
D third_party/libusb/libusb/os/linux_usbfs.c View 1 chunk +0 lines, -2313 lines 0 comments Download
D third_party/libusb/libusb/os/poll_posix.h View 1 chunk +0 lines, -10 lines 0 comments Download
D third_party/libusb/libusb/os/poll_windows.h View 1 chunk +0 lines, -111 lines 0 comments Download
D third_party/libusb/libusb/os/poll_windows.c View 1 chunk +0 lines, -839 lines 0 comments Download
D third_party/libusb/libusb/os/threads_posix.h View 1 chunk +0 lines, -48 lines 0 comments Download
D third_party/libusb/libusb/os/threads_posix.c View 1 chunk +0 lines, -55 lines 0 comments Download
D third_party/libusb/libusb/os/threads_windows.h View 1 chunk +0 lines, -86 lines 0 comments Download
D third_party/libusb/libusb/os/threads_windows.c View 1 chunk +0 lines, -208 lines 0 comments Download
D third_party/libusb/libusb/os/windows_usb.h View 1 chunk +0 lines, -606 lines 0 comments Download
D third_party/libusb/libusb/os/windows_usb.c View 1 chunk +0 lines, -3038 lines 0 comments Download
D third_party/libusb/libusb/sync.c View 1 chunk +0 lines, -314 lines 0 comments Download
D third_party/libusb/libusb/version.h View 1 chunk +0 lines, -18 lines 0 comments Download
D third_party/libusb/msvc/config.h View 1 chunk +0 lines, -23 lines 0 comments Download
D third_party/libusb/msvc/ddk_build.cmd View 1 chunk +0 lines, -106 lines 0 comments Download
D third_party/libusb/msvc/inttypes.h View 1 chunk +0 lines, -295 lines 0 comments Download
D third_party/libusb/msvc/libusb.dsw View 1 chunk +0 lines, -56 lines 0 comments Download
D third_party/libusb/msvc/libusb_dll.dsp View 1 chunk +0 lines, -190 lines 0 comments Download
D third_party/libusb/msvc/libusb_sources View 1 chunk +0 lines, -36 lines 0 comments Download
D third_party/libusb/msvc/libusb_static.dsp View 1 chunk +0 lines, -170 lines 0 comments Download
D third_party/libusb/msvc/lsusb_sources View 1 chunk +0 lines, -19 lines 0 comments Download
D third_party/libusb/msvc/stdint.h View 1 chunk +0 lines, -256 lines 0 comments Download
A + third_party/libusb/src/AUTHORS View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/COPYING View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/INSTALL View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/Makefile.am View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/NEWS View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/PORTING View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/README View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/THANKS View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/TODO View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/autogen.sh View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/config.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/configure.ac View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/doc/Makefile.am View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/doc/doxygen.cfg.in View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/examples/Makefile.am View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/examples/dpfp.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/examples/dpfp_threaded.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/examples/lsusb.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb-1.0.pc.in View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/Makefile.am View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/core.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/descriptor.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/io.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/libusb.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/libusb-1.0.def View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/libusb-1.0.rc View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/libusbi.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/darwin_usb.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/darwin_usb.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/linux_usbfs.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/linux_usbfs.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/poll_posix.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/poll_windows.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/poll_windows.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/threads_posix.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/threads_posix.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/threads_windows.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/threads_windows.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/windows_usb.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/os/windows_usb.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/sync.c View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/libusb/version.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/config.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/ddk_build.cmd View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/inttypes.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/libusb.dsw View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/libusb_dll.dsp View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/libusb_sources View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/libusb_static.dsp View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/lsusb_sources View 0 chunks +-1 lines, --1 lines 0 comments Download
A + third_party/libusb/src/msvc/stdint.h View 0 chunks +-1 lines, --1 lines 0 comments Download
M tools/checklicenses/checklicenses.py View 1 1 chunk +5 lines, -5 lines 0 comments Download

Messages

Total messages: 14 (0 generated)
sadrul
Rubber-stamp LGTM
8 years, 7 months ago (2012-05-09 19:14:18 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gdk@chromium.org/10332075/1
8 years, 7 months ago (2012-05-09 19:16:23 UTC) #2
commit-bot: I haz the power
Change committed as 136127
8 years, 7 months ago (2012-05-09 21:17:14 UTC) #3
Lei Zhang
check_licenses.py change LGTM.
8 years, 7 months ago (2012-05-09 23:31:15 UTC) #4
Paweł Hajdan Jr.
Drive-by (nice to see this done; the patch looks really good, just some minor comments). ...
8 years, 7 months ago (2012-05-10 06:36:14 UTC) #5
Garret Kelly
http://codereview.chromium.org/10332075/diff/10001/chrome/browser/usb/usb_service.cc File chrome/browser/usb/usb_service.cc (right): http://codereview.chromium.org/10332075/diff/10001/chrome/browser/usb/usb_service.cc#newcode78 chrome/browser/usb/usb_service.cc:78: // TODO(gdk): Once there is a reasonable expectation that ...
8 years, 7 months ago (2012-05-10 17:44:01 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gdk@chromium.org/10332075/11110
8 years, 7 months ago (2012-05-10 17:46:59 UTC) #7
commit-bot: I haz the power
Try job failure for 10332075-11110 (retry) (retry) on linux_rel for step "browser_tests". It's a second ...
8 years, 7 months ago (2012-05-10 19:38:50 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gdk@chromium.org/10332075/11110
8 years, 7 months ago (2012-05-10 19:44:30 UTC) #9
commit-bot: I haz the power
Try job failure for 10332075-11110 (retry) on android for steps "Compile, build". It's a second ...
8 years, 7 months ago (2012-05-10 20:08:27 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/gdk@chromium.org/10332075/11110
8 years, 7 months ago (2012-05-10 20:18:32 UTC) #11
commit-bot: I haz the power
Change committed as 136421
8 years, 7 months ago (2012-05-10 22:52:59 UTC) #12
Paweł Hajdan Jr.
Garret, thank you for landing the patch. It seems that there is just last bit ...
8 years, 7 months ago (2012-05-11 10:06:05 UTC) #13
Garret Kelly
8 years, 7 months ago (2012-05-11 15:32:46 UTC) #14
Hi Paweł,

> Garret, thank you for landing the patch. It seems that there is just last bit
of
> work remaining to do. Gentoo users are reporting problems, see
> https://bugs.gentoo.org/show_bug.cgi?id=413251#c4
> 
> Looking at chromium/src/chrome/chrome_browser_extensions.gypi, I think it
needs
> a dependency on libusb.gyp, so that USE_SYSTEM_LIBUSB symbol is defined there.
> 
> You can test for those cases by temporarily removing the bundled headers from
> local checkout and building with -Duse_system_libusb=1 . Gentoo removes
bundled
> headers to ensure they are not used, and detect cases like this, which would
> otherwise result in silent headers mix-up.
> 
> Please add the missing dependency on libusb.gyp in
> chromium/src/chrome/chrome_browser_extensions.gypi and any other places where
> it's missing (if any). Thanks!

Ah, I hadn't even thought to do that. Thanks for pointing this out. I'm fixing
it right now.

Garret

Powered by Google App Engine
This is Rietveld 408576698