diff options
| author | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 16:07:11 +0000 |
|---|---|---|
| committer | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 16:07:11 +0000 |
| commit | 5d2db6e59c33ee2bd4151a151f68d05cd2959d08 (patch) | |
| tree | a5df64df26852fff9586bbf9315c56d84acf87f3 /extensions/extensions_resources.gyp | |
| parent | fa9db4b07d679b8c0860ca1ebb8c8bc38342db15 (diff) | |
| download | chromium_src-5d2db6e59c33ee2bd4151a151f68d05cd2959d08.zip chromium_src-5d2db6e59c33ee2bd4151a151f68d05cd2959d08.tar.gz chromium_src-5d2db6e59c33ee2bd4151a151f68d05cd2959d08.tar.bz2 | |
Revert 286199 "Implement chrome.serial.getDevices() on top of th..."
Causes compiles failures on the builder.
http://build.chromium.org/p/chromium/builders/Win/builds/22934
[1464/26469 | 38.034] CC obj\third_party\opus\src\silk\opus.debug.obj
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\device\serial\device_serial_test_util.test_serial_io_handler.obj.rsp /c ..\..\device\serial\test_serial_io_handler.cc /Foobj\device\serial\device_serial_test_util.test_serial_io_handler.obj /Fdobj\device\serial\device_serial_test_util.cc.pdb
c:\b\build\slave\win\build\src\device\serial\test_serial_io_handler.h(11) : fatalerror C1083: Cannot open include file: 'device/serial/serial.mojom.h': No such file or directory
ninja: build stopped: subcommand failed.
> Implement chrome.serial.getDevices() on top of the Mojo serial service.
>
> This does not change Chrome to use the new implementation.
>
> BUG=389016
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286122
>
> Review URL: https://codereview.chromium.org/391413005
TBR=sammc@chromium.org
Review URL: https://codereview.chromium.org/423163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/extensions_resources.gyp')
| -rw-r--r-- | extensions/extensions_resources.gyp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/extensions/extensions_resources.gyp b/extensions/extensions_resources.gyp index 0a000ac..8c56e20 100644 --- a/extensions/extensions_resources.gyp +++ b/extensions/extensions_resources.gyp @@ -7,9 +7,6 @@ { 'target_name': 'extensions_resources', 'type': 'none', - 'dependencies': [ - '../device/serial/serial.gyp:device_serial_mojo', - ], 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions', }, @@ -25,9 +22,6 @@ 'action_name': 'generate_extensions_renderer_resources', 'variables': { 'grit_grd_file': 'renderer/resources/extensions_renderer_resources.grd', - 'grit_additional_defines': [ - '-E', 'mojom_root=<(SHARED_INTERMEDIATE_DIR)', - ], }, 'includes': [ '../build/grit_action.gypi' ], }, |