diff options
| author | reillyg <reillyg@chromium.org> | 2014-09-03 17:57:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 01:03:27 +0000 |
| commit | d77718de5c3963cf0fe31e59c27c3e2aebfb26cb (patch) | |
| tree | 65a996cddf74653fa2b4d1c3d583110eaa8132cf /components/components_tests.gyp | |
| parent | 6b0fbe4cbbdd357a17c8a72f92535403fa50515a (diff) | |
| download | chromium_src-d77718de5c3963cf0fe31e59c27c3e2aebfb26cb.zip chromium_src-d77718de5c3963cf0fe31e59c27c3e2aebfb26cb.tar.gz chromium_src-d77718de5c3963cf0fe31e59c27c3e2aebfb26cb.tar.bz2 | |
Merge components/usb_service into device/usb.
Unify these two parts of out USB device support. The //device tree is
the cannonical location for hardware device APIs.
BUG=
Review URL: https://codereview.chromium.org/497363004
Cr-Commit-Position: refs/heads/master@{#293246}
Diffstat (limited to 'components/components_tests.gyp')
| -rw-r--r-- | components/components_tests.gyp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 1af0a56..37f3fc8 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -433,8 +433,6 @@ 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc', 'dom_distiller/content/dom_distiller_viewer_source_unittest.cc', 'power/origin_power_map_unittest.cc', - 'usb_service/usb_context_unittest.cc', - 'usb_service/usb_device_filter_unittest.cc', ], 'dependencies': [ # Dependencies of autofill @@ -476,10 +474,6 @@ # Dependencies of url_matcher. 'components.gyp:url_matcher', - # Dependencies of usb_service tests. - 'components.gyp:usb_service', - '../third_party/libusb/libusb.gyp:libusb', - # Dependencies of visitedlink 'components.gyp:visitedlink_browser', 'components.gyp:visitedlink_renderer', @@ -593,8 +587,6 @@ 'storage_monitor/media_storage_util_unittest.cc', 'storage_monitor/storage_info_unittest.cc', 'storage_monitor/storage_monitor_unittest.cc', - 'usb_service/usb_context_unittest.cc', - 'usb_service/usb_device_filter_unittest.cc', 'web_modal/web_contents_modal_dialog_manager_unittest.cc', ], 'dependencies': [ @@ -604,10 +596,8 @@ 'components.gyp:feedback_component', 'components.gyp:storage_monitor', 'components.gyp:storage_monitor_test_support', - 'components.gyp:usb_service', 'components.gyp:web_modal', 'components.gyp:web_modal_test_support', - '../third_party/libusb/libusb.gyp:libusb', ], }], ['OS != "android"', { @@ -668,13 +658,11 @@ }], ['OS=="linux" and use_udev==0', { 'dependencies!': [ - '../third_party/libusb/libusb.gyp:libusb', 'components.gyp:storage_monitor', 'components.gyp:storage_monitor_test_support', ], 'sources/': [ ['exclude', '^storage_monitor/'], - ['exclude', '^usb_service/'], ], }], ['OS=="win" and win_use_allocator_shim==1', { |