summaryrefslogtreecommitdiffstats
path: root/device/usb/usb.gyp
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2016-02-10 15:29:20 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-10 23:31:02 +0000
commit64c8f4f25d9fbd2233e476d6276b4c63bcc4813c (patch)
tree6b493ace49c49e995601c33d9ef14a94ccfe2f85 /device/usb/usb.gyp
parentd1a4b660eb29113ef2a08f8544ebf1f2b212e6ec (diff)
downloadchromium_src-64c8f4f25d9fbd2233e476d6276b4c63bcc4813c.zip
chromium_src-64c8f4f25d9fbd2233e476d6276b4c63bcc4813c.tar.gz
chromium_src-64c8f4f25d9fbd2233e476d6276b4c63bcc4813c.tar.bz2
Remove //device/devices_app.
This change removes the code to create a Mojo app containing device services (currently only USB) and instead makes the Mojo bindings for //device/usb part of that directory. The Mojo service implementation is still in a separate //device/usb/mojo target but this will eventually merge into its parent directory as the Mojo interface becomes the only public interface for //device/usb. BUG=None Review URL: https://codereview.chromium.org/1682363002 Cr-Commit-Position: refs/heads/master@{#374778}
Diffstat (limited to 'device/usb/usb.gyp')
-rw-r--r--device/usb/usb.gyp18
1 files changed, 18 insertions, 0 deletions
diff --git a/device/usb/usb.gyp b/device/usb/usb.gyp
index a68b187..7f5e676 100644
--- a/device/usb/usb.gyp
+++ b/device/usb/usb.gyp
@@ -22,6 +22,12 @@
'sources': [
'android/usb_jni_registrar.cc',
'android/usb_jni_registrar.h',
+ 'mojo/device_impl.cc',
+ 'mojo/device_impl.h',
+ 'mojo/device_manager_impl.cc',
+ 'mojo/device_manager_impl.h',
+ 'mojo/type_converters.cc',
+ 'mojo/type_converters.h',
'usb_configuration_android.cc',
'usb_configuration_android.h',
'usb_context.cc',
@@ -116,6 +122,18 @@
]
},
{
+ 'target_name': 'device_usb_mojo_bindings',
+ 'type': 'static_library',
+ 'sources': [
+ 'public/interfaces/device.mojom',
+ 'public/interfaces/device_manager.mojom',
+ 'public/interfaces/permission_provider.mojom',
+ ],
+ 'includes': [
+ '../../mojo/mojom_bindings_generator.gypi',
+ ],
+ },
+ {
'target_name': 'device_usb_mocks',
'type': 'static_library',
'include_dirs': [