diff options
| author | rockot <rockot@chromium.org> | 2014-12-16 10:48:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-16 18:49:16 +0000 |
| commit | 829dc9ae81e2ad2f6b890dde15cbe2fc299bc711 (patch) | |
| tree | e6efa5fc37e4da6499ec84aa54997b83fb2a90f5 /ipc | |
| parent | 7e9b46ebc6c08d327da7a9c1047602a6ec720d23 (diff) | |
| download | chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.zip chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.gz chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.bz2 | |
Move mojo gypfiles to toplevel mojo
These files are owned by chromium now. It would not only be weird
to inject them into the rolled mojo directory structure, but doing
so would unnecessarily complicate the mojo up-rev procedure.
BUG=None
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/807773002
Cr-Commit-Position: refs/heads/master@{#308622}
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mojo/ipc_mojo.gyp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp index 1ca1775..1f27711 100644 --- a/ipc/mojo/ipc_mojo.gyp +++ b/ipc/mojo/ipc_mojo.gyp @@ -17,14 +17,14 @@ 'defines': [ 'IPC_MOJO_IMPLEMENTATION', ], - 'includes': [ '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ], + 'includes': [ '../../mojo/mojom_bindings_generator.gypi' ], 'dependencies': [ '../ipc.gyp:ipc', '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../../mojo/edk/mojo_edk.gyp:mojo_system_impl', '../../mojo/mojo_base.gyp:mojo_environment_chromium', - '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings', + '../../mojo/mojo_edk.gyp:mojo_system_impl', + '../../mojo/mojo_public.gyp:mojo_cpp_bindings', ], 'sources': [ 'client_channel.mojom', @@ -54,9 +54,9 @@ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', '../../base/base.gyp:test_support_base', - '../../mojo/edk/mojo_edk.gyp:mojo_system_impl', '../../mojo/mojo_base.gyp:mojo_environment_chromium', - '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings', + '../../mojo/mojo_edk.gyp:mojo_system_impl', + '../../mojo/mojo_public.gyp:mojo_cpp_bindings', '../../testing/gtest.gyp:gtest', 'ipc_mojo', ], @@ -81,9 +81,9 @@ '../../base/base.gyp:base_i18n', '../../base/base.gyp:test_support_base', '../../base/base.gyp:test_support_perf', - '../../mojo/edk/mojo_edk.gyp:mojo_system_impl', '../../mojo/mojo_base.gyp:mojo_environment_chromium', - '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings', + '../../mojo/mojo_edk.gyp:mojo_system_impl', + '../../mojo/mojo_public.gyp:mojo_cpp_bindings', '../../testing/gtest.gyp:gtest', 'ipc_mojo', ], |