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

Side by Side Diff: third_party/libusb/libusb.gyp

Issue 10519005: Fix libusb dependecy for Chromium with Android OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: code review comments done. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'use_system_libusb%': 0, 7 'use_system_libusb%': 0,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'libusb', 11 'target_name': 'libusb',
12 'conditions': [
Paweł Hajdan Jr. 2012/06/06 10:02:32 Does this pass gyp syntax?
felipeg 2012/06/06 10:04:48 Done.
13 ['OS == "linux" and use_system_libusb', { 12 ['OS == "linux" and use_system_libusb', {
14 'type': 'none', 13 'type': 'none',
15 'direct_dependent_settings': { 14 'direct_dependent_settings': {
16 'defines': [ 15 'defines': [
17 'USE_SYSTEM_LIBUSB', 16 'USE_SYSTEM_LIBUSB',
18 ], 17 ],
19 'cflags': [ 18 'cflags': [
20 '<!@(pkg-config --cflags libusb-1.0)', 19 '<!@(pkg-config --cflags libusb-1.0)',
21 ], 20 ],
22 'link_settings': { 21 'link_settings': {
(...skipping 12 matching lines...) Expand all
35 'src/libusb/descriptor.c', 34 'src/libusb/descriptor.c',
36 'src/libusb/io.c', 35 'src/libusb/io.c',
37 'src/libusb/sync.c', 36 'src/libusb/sync.c',
38 ], 37 ],
39 'include_dirs': [ 38 'include_dirs': [
40 'src', 39 'src',
41 'src/libusb', 40 'src/libusb',
42 'src/libusb/os', 41 'src/libusb/os',
43 ], 42 ],
44 'conditions': [ 43 'conditions': [
45 [ 'OS == "linux"', { 44 [ 'OS == "linux" or OS == "android"', {
46 'sources': [ 45 'sources': [
47 'src/libusb/os/linux_usbfs.c', 46 'src/libusb/os/linux_usbfs.c',
48 'src/libusb/os/threads_posix.c', 47 'src/libusb/os/threads_posix.c',
49 ], 48 ],
50 'defines': [ 49 'defines': [
51 'DEFAULT_VISIBILITY=', 50 'DEFAULT_VISIBILITY=',
52 'HAVE_POLL_H=1', 51 'HAVE_POLL_H=1',
53 'HAVE_SYS_TIME_H=1', 52 'HAVE_SYS_TIME_H=1',
54 'OS_LINUX=1', 53 'OS_LINUX=1',
55 'POLL_NFDS_TYPE=nfds_t', 54 'POLL_NFDS_TYPE=nfds_t',
(...skipping 28 matching lines...) Expand all
84 'THREADS_POSIX=1', 83 'THREADS_POSIX=1',
85 '_GNU_SOURCE=1', 84 '_GNU_SOURCE=1',
86 ], 85 ],
87 }], 86 }],
88 ], 87 ],
89 }], 88 }],
90 ], 89 ],
91 }, 90 },
92 ], 91 ],
93 } 92 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698