summaryrefslogtreecommitdiffstats
path: root/third_party/libusb
diff options
context:
space:
mode:
authorpneubeck <pneubeck@chromium.org>2015-09-30 02:24:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-30 09:24:58 +0000
commit72af5ad20c1b2b4a1b3018675d3e11a09f9bdfba (patch)
treec87efe2353e6f8c62252c2fa6f1aeab306686e3c /third_party/libusb
parentef79bae8f70aacc383004ce0f7113dbf7ce79056 (diff)
downloadchromium_src-72af5ad20c1b2b4a1b3018675d3e11a09f9bdfba.zip
chromium_src-72af5ad20c1b2b4a1b3018675d3e11a09f9bdfba.tar.gz
chromium_src-72af5ad20c1b2b4a1b3018675d3e11a09f9bdfba.tar.bz2
Enable timerfd in libusb.
Reland of: https://codereview.chromium.org/1368773005/ BUG=535950 TBR=reillyg@chromium.org Review URL: https://codereview.chromium.org/1379793002 Cr-Commit-Position: refs/heads/master@{#351525}
Diffstat (limited to 'third_party/libusb')
-rw-r--r--third_party/libusb/BUILD.gn4
-rw-r--r--third_party/libusb/libusb.gyp5
2 files changed, 9 insertions, 0 deletions
diff --git a/third_party/libusb/BUILD.gn b/third_party/libusb/BUILD.gn
index 0d7c929..39afaf3 100644
--- a/third_party/libusb/BUILD.gn
+++ b/third_party/libusb/BUILD.gn
@@ -99,6 +99,10 @@ static_library("libusb") {
]
}
+ if (is_chromeos) {
+ defines += [ "USBI_TIMERFD_AVAILABLE" ]
+ }
+
if (use_udev) {
sources += [ "src/libusb/os/linux_udev.cc" ]
defines += [
diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp
index 85f5230..1b0aa56 100644
--- a/third_party/libusb/libusb.gyp
+++ b/third_party/libusb/libusb.gyp
@@ -67,6 +67,11 @@
'_GNU_SOURCE=1',
],
}],
+ ['chromeos==1', {
+ 'defines': [
+ 'USBI_TIMERFD_AVAILABLE',
+ ]
+ }],
['use_udev==1', {
'sources': [
'src/libusb/os/linux_udev.cc',