Chromium Code Reviews| Index: third_party/libusb/libusb.gyp |
| diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp |
| index 4fc0c7e6b9061108b2bff63121ecc54948e48b70..48f81b20242dd966e0b0078a1eca0c6185944019 100644 |
| --- a/third_party/libusb/libusb.gyp |
| +++ b/third_party/libusb/libusb.gyp |
| @@ -9,7 +9,6 @@ |
| 'targets': [ |
| { |
| 'target_name': 'libusb', |
| - 'conditions': [ |
|
Paweł Hajdan Jr.
2012/06/06 10:02:32
Does this pass gyp syntax?
felipeg
2012/06/06 10:04:48
Done.
|
| ['OS == "linux" and use_system_libusb', { |
| 'type': 'none', |
| 'direct_dependent_settings': { |
| @@ -42,7 +41,7 @@ |
| 'src/libusb/os', |
| ], |
| 'conditions': [ |
| - [ 'OS == "linux"', { |
| + [ 'OS == "linux" or OS == "android"', { |
| 'sources': [ |
| 'src/libusb/os/linux_usbfs.c', |
| 'src/libusb/os/threads_posix.c', |