diff options
| author | serya@chromium.org <serya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 10:21:42 +0000 |
|---|---|---|
| committer | serya@chromium.org <serya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 10:21:42 +0000 |
| commit | 1dff3e93163bc6929c2e1414b89cea3cf721f608 (patch) | |
| tree | c2ca5982eb817428de5738db5c978c95af045bc4 /device | |
| parent | b930bbfa802e9fa6b7d2a80fedf8730cd309d8fc (diff) | |
| download | chromium_src-1dff3e93163bc6929c2e1414b89cea3cf721f608.zip chromium_src-1dff3e93163bc6929c2e1414b89cea3cf721f608.tar.gz chromium_src-1dff3e93163bc6929c2e1414b89cea3cf721f608.tar.bz2 | |
Revert 286122 "Implement chrome.serial.getDevices() on top of th..."
Looks quilty in compilation failure: http://build.chromium.org/p/chromium/builders/Win/builds/22924
> Implement chrome.serial.getDevices() on top of the Mojo serial service.
>
> This does not change Chrome to use the new implementation.
>
> BUG=389016
>
> Review URL: https://codereview.chromium.org/391413005
TBR=sammc@chromium.org
Review URL: https://codereview.chromium.org/414333005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
| -rw-r--r-- | device/serial/BUILD.gn | 6 | ||||
| -rw-r--r-- | device/serial/serial.gyp | 27 |
2 files changed, 8 insertions, 25 deletions
diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn index 7797c3f..9250c9f 100644 --- a/device/serial/BUILD.gn +++ b/device/serial/BUILD.gn @@ -54,12 +54,8 @@ static_library("test_util") { ] } -# GYP version: device/serial/serial.gyp:device_serial_mojo mojom("serial_mojo") { - visibility = [ - ":serial", - "//extensions:extensions_renderer_resources_grit", - ] + visibility = ":serial" sources = [ "serial.mojom", diff --git a/device/serial/serial.gyp b/device/serial/serial.gyp index 676d10e..dec3102 100644 --- a/device/serial/serial.gyp +++ b/device/serial/serial.gyp @@ -8,26 +8,11 @@ }, 'targets': [ { - # GN version: //device/serial:serial_mojo - 'target_name': 'device_serial_mojo', - # The type of this target must be none. This is so that resources can - # depend upon this target for generating the js bindings files. Any - # generated cpp files must be listed explicitly in device_serial - 'type': 'none', - 'includes': [ - '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi', - ], - 'sources': [ - 'serial.mojom', - ], - }, - { # GN version: //device/serial 'target_name': 'device_serial', 'type': 'static_library', 'include_dirs': [ '../..', - '<(SHARED_INTERMEDIATE_DIR)', ], 'conditions': [ ['OS=="linux"', { @@ -36,6 +21,12 @@ ], }], ], + 'variables': { + 'mojom_base_output_dir': 'device/serial', + }, + 'includes': [ + '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi', + ], 'dependencies': [ '../../mojo/mojo.gyp:mojo_cpp_bindings', '../../net/net.gyp:net', @@ -44,8 +35,7 @@ '../../mojo/mojo.gyp:mojo_cpp_bindings', ], 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/device/serial/serial.mojom.cc', - '<(SHARED_INTERMEDIATE_DIR)/device/serial/serial.mojom.h', + 'serial.mojom', 'serial_connection.cc', 'serial_connection.h', 'serial_connection_factory.cc', @@ -75,9 +65,6 @@ 'dependencies': [ 'device_serial', ], - 'include_dirs': [ - '../..', - ], 'sources': [ 'test_serial_io_handler.cc', 'test_serial_io_handler.h', |