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

Unified Diff: components/usb_service.gypi

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/components_tests.gyp ('k') | components/usb_service/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/usb_service.gypi
diff --git a/components/usb_service.gypi b/components/usb_service.gypi
deleted file mode 100644
index 6d2d6747d2d88979eca584e6f95fd499911e6420..0000000000000000000000000000000000000000
--- a/components/usb_service.gypi
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'targets': [{
- # GN version: //components/usb_service
- 'target_name': 'usb_service',
- 'type': '<(component)',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../content/content.gyp:content_browser',
- '../net/net.gyp:net',
- '../third_party/libusb/libusb.gyp:libusb',
- ],
- 'defines': [
- 'USB_SERVICE_IMPLEMENTATION',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- # Note: sources list duplicated in GN build.
- 'usb_service/usb_context.cc',
- 'usb_service/usb_context.h',
- 'usb_service/usb_device_impl.cc',
- 'usb_service/usb_device_impl.h',
- 'usb_service/usb_device.h',
- 'usb_service/usb_device_filter.cc',
- 'usb_service/usb_device_filter.h',
- 'usb_service/usb_device_handle_impl.cc',
- 'usb_service/usb_device_handle_impl.h',
- 'usb_service/usb_device_handle.h',
- 'usb_service/usb_error.cc',
- 'usb_service/usb_error.h',
- 'usb_service/usb_interface.h',
- 'usb_service/usb_interface_impl.cc',
- 'usb_service/usb_interface_impl.h',
- 'usb_service/usb_service.h',
- 'usb_service/usb_service_impl.cc',
- ],
- 'conditions': [
- ['use_udev == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:udev',
- ],
- }],
- ['chromeos==1', {
- 'dependencies': [
- '../chromeos/chromeos.gyp:chromeos',
- ],
- }],
- ]
- }],
-}
« no previous file with comments | « components/components_tests.gyp ('k') | components/usb_service/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698