summaryrefslogtreecommitdiffstats
path: root/components/components.gyp
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2014-09-03 17:57:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-04 01:03:27 +0000
commitd77718de5c3963cf0fe31e59c27c3e2aebfb26cb (patch)
tree65a996cddf74653fa2b4d1c3d583110eaa8132cf /components/components.gyp
parent6b0fbe4cbbdd357a17c8a72f92535403fa50515a (diff)
downloadchromium_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.gyp')
-rw-r--r--components/components.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/components/components.gyp b/components/components.gyp
index 634b112..540babc 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -81,7 +81,6 @@
'includes': [
'copresence.gypi',
'storage_monitor.gypi',
- 'usb_service.gypi',
]
}],
['chromeos == 1', {