diff options
| author | reillyg <reillyg@chromium.org> | 2016-02-10 19:36:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-11 03:37:52 +0000 |
| commit | c8107b9d3cac87c58560596d66d7de8627d486b4 (patch) | |
| tree | 711604b34ecbed2e00820764e2c1eea2958aa672 /components | |
| parent | b663c523bddc75b4b2009f8804b054e777e84a37 (diff) | |
| download | chromium_src-c8107b9d3cac87c58560596d66d7de8627d486b4.zip chromium_src-c8107b9d3cac87c58560596d66d7de8627d486b4.tar.gz chromium_src-c8107b9d3cac87c58560596d66d7de8627d486b4.tar.bz2 | |
Remove the components_webusb_mojo_bindings_lib target.
This patch upgrades //components/webusb to declare a single Mojo
bindings target that uses mojom_bindings_generator.gypi instead of
mojom_bindings_generator_explicit.gypi.
This should solve a build error caused by a break in the chain of
dependencies between the USB Mojo interface headers and the WebUSB Mojo
interface headers.
BUG=586040
Review URL: https://codereview.chromium.org/1690863002
Cr-Commit-Position: refs/heads/master@{#374851}
Diffstat (limited to 'components')
| -rw-r--r-- | components/webusb.gypi | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/components/webusb.gypi b/components/webusb.gypi index 16a69c1..cad67c9 100644 --- a/components/webusb.gypi +++ b/components/webusb.gypi @@ -11,7 +11,7 @@ '../base/base.gyp:base', '../device/core/core.gyp:device_core', '../device/usb/usb.gyp:device_usb', - 'components_webusb_mojo_bindings_lib', + 'components_webusb_mojo_bindings', ], 'include_dirs': [ '..', @@ -24,24 +24,15 @@ }, { 'target_name': 'components_webusb_mojo_bindings', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'webusb/public/interfaces/webusb_permission_bubble.mojom', - ], - 'dependencies': [ - '../device/usb/usb.gyp:device_usb_mojo_bindings', - ], - }, - 'includes': [ - '../mojo/mojom_bindings_generator_explicit.gypi', - ], - }, - { - 'target_name': 'components_webusb_mojo_bindings_lib', 'type': 'static_library', 'dependencies': [ - 'components_webusb_mojo_bindings', + '../device/usb/usb.gyp:device_usb_mojo_bindings', + ], + 'sources': [ + 'webusb/public/interfaces/webusb_permission_bubble.mojom', + ], + 'includes': [ + '../mojo/mojom_bindings_generator.gypi', ], }, ], |