Chromium Code Reviews| Index: device/device.gyp |
| diff --git a/device/device.gyp b/device/device.gyp |
| index d1f27e4f15728d21b58a6093b2c33376f563ccf6..ca985c42361a8706a6fcaf6236a2f992d3cd38db 100644 |
| --- a/device/device.gyp |
| +++ b/device/device.gyp |
| @@ -69,11 +69,46 @@ |
| ], |
| }, |
| { |
| + 'target_name': 'device_usb', |
| + '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.
|
| + 'sources': [ |
| + 'usb/usb_ids.cc', |
| + 'usb/usb_ids.h', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'actions': [ |
| + { |
| + 'action_name': 'generate_usb_ids', |
| + 'variables': { |
| + 'usb_ids_path': '<(DEPTH)/third_party/usb-ids/usb.ids', |
| + 'usb_ids_py_path': '<(DEPTH)/tools/usb_ids/usb_ids.py', |
| + }, |
| + 'inputs': [ |
| + '<(usb_ids_path)', |
| + '<(usb_ids_py_path)', |
| + ], |
| + 'outputs': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/device/usb_ids_gen.cc', |
| + ], |
| + 'action': [ |
| + 'python', |
| + '<(usb_ids_py_path)', |
| + '-i', '<(usb_ids_path)', |
| + '-o', '<@(_outputs)', |
| + ], |
| + 'process_outputs_as_sources': 1, |
| + }, |
| + ], |
| + }, |
| + { |
| 'target_name': 'device_unittests', |
| 'type': '<(gtest_target_type)', |
| 'dependencies': [ |
| 'device_bluetooth', |
| 'device_bluetooth_mocks', |
| + 'device_usb', |
| '../base/base.gyp:test_support_base', |
| '../content/content.gyp:test_support_content', |
| '../testing/gmock.gyp:gmock', |
| @@ -87,6 +122,7 @@ |
| 'test/device_test_suite.cc', |
| 'test/device_test_suite.h', |
| 'test/run_all_unittests.cc', |
| + 'usb/usb_ids_unittest.cc', |
| ], |
| 'conditions': [ |
| ['chromeos==1', { |