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

Side by Side Diff: device/device.gyp

Issue 11344039: Adding USB ID vendor and product lookups. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding documentation strings. Created 8 years, 1 month 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 | Annotate | Revision Log
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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 'bluetooth/test/mock_bluetooth_adapter.cc', 62 'bluetooth/test/mock_bluetooth_adapter.cc',
63 'bluetooth/test/mock_bluetooth_adapter.h', 63 'bluetooth/test/mock_bluetooth_adapter.h',
64 'bluetooth/test/mock_bluetooth_device.cc', 64 'bluetooth/test/mock_bluetooth_device.cc',
65 'bluetooth/test/mock_bluetooth_device.h', 65 'bluetooth/test/mock_bluetooth_device.h',
66 ], 66 ],
67 'include_dirs': [ 67 'include_dirs': [
68 '..', 68 '..',
69 ], 69 ],
70 }, 70 },
71 { 71 {
72 'target_name': 'device_usb',
73 'type': '<(library)',
bryeung 2012/10/31 15:01:27 should be 'static_library' Please see: http://cod
bryeung 2012/10/31 15:28:38 Looks like you missed this fix?
Garret Kelly 2012/10/31 15:49:54 Done.
74 'sources': [
75 'usb/usb_ids.cc',
76 'usb/usb_ids.h',
77 ],
78 'include_dirs': [
79 '..',
80 ],
81 'actions': [
82 {
83 'action_name': 'generate_usb_ids',
84 'variables': {
85 'usb_ids_path': '<(DEPTH)/third_party/usb-ids/usb.ids',
86 'usb_ids_py_path': '<(DEPTH)/tools/usb_ids/usb_ids.py',
87 },
88 'inputs': [
89 '<(usb_ids_path)',
90 '<(usb_ids_py_path)',
91 ],
92 'outputs': [
93 '<(SHARED_INTERMEDIATE_DIR)/device/usb_ids_gen.cc',
94 ],
95 'action': [
96 'python',
97 '<(usb_ids_py_path)',
98 '-i', '<(usb_ids_path)',
99 '-o', '<@(_outputs)',
100 ],
101 'process_outputs_as_sources': 1,
102 },
103 ],
104 },
105 {
72 'target_name': 'device_unittests', 106 'target_name': 'device_unittests',
73 'type': '<(gtest_target_type)', 107 'type': '<(gtest_target_type)',
74 'dependencies': [ 108 'dependencies': [
75 'device_bluetooth', 109 'device_bluetooth',
76 'device_bluetooth_mocks', 110 'device_bluetooth_mocks',
111 'device_usb',
77 '../base/base.gyp:test_support_base', 112 '../base/base.gyp:test_support_base',
78 '../content/content.gyp:test_support_content', 113 '../content/content.gyp:test_support_content',
79 '../testing/gmock.gyp:gmock', 114 '../testing/gmock.gyp:gmock',
80 '../testing/gtest.gyp:gtest', 115 '../testing/gtest.gyp:gtest',
81 ], 116 ],
82 'sources': [ 117 'sources': [
83 'bluetooth/bluetooth_adapter_chromeos_unittest.cc', 118 'bluetooth/bluetooth_adapter_chromeos_unittest.cc',
84 'bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc', 119 'bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc',
85 'bluetooth/bluetooth_service_record_unittest.cc', 120 'bluetooth/bluetooth_service_record_unittest.cc',
86 'bluetooth/bluetooth_utils_unittest.cc', 121 'bluetooth/bluetooth_utils_unittest.cc',
87 'test/device_test_suite.cc', 122 'test/device_test_suite.cc',
88 'test/device_test_suite.h', 123 'test/device_test_suite.h',
89 'test/run_all_unittests.cc', 124 'test/run_all_unittests.cc',
125 'usb/usb_ids_unittest.cc',
90 ], 126 ],
91 'conditions': [ 127 'conditions': [
92 ['chromeos==1', { 128 ['chromeos==1', {
93 'dependencies': [ 129 'dependencies': [
94 '../build/linux/system.gyp:dbus', 130 '../build/linux/system.gyp:dbus',
95 '../chromeos/chromeos.gyp:chromeos_test_support', 131 '../chromeos/chromeos.gyp:chromeos_test_support',
96 '../dbus/dbus.gyp:dbus', 132 '../dbus/dbus.gyp:dbus',
97 ] 133 ]
98 }], 134 }],
99 ], 135 ],
100 }, 136 },
101 ], 137 ],
102 } 138 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698