summaryrefslogtreecommitdiffstats
path: root/third_party/mojo/mojo_edk_system_impl.gypi
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2015-06-12 11:40:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-12 18:40:42 +0000
commit3b2e73c9e794a80a6ae44b4b953d7df477fb66c2 (patch)
tree00aa7ab894e6ae72d02b61d07c9fd236159e8961 /third_party/mojo/mojo_edk_system_impl.gypi
parent10b233977fc40d9853979cdedb05750f3dc4c9be (diff)
downloadchromium_src-3b2e73c9e794a80a6ae44b4b953d7df477fb66c2.zip
chromium_src-3b2e73c9e794a80a6ae44b4b953d7df477fb66c2.tar.gz
chromium_src-3b2e73c9e794a80a6ae44b4b953d7df477fb66c2.tar.bz2
Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286
Adds flag to build/module_args/mojo.gni to turn off SDK network service. Updates callsites of mojo::embedder::CreateChannel to remove an argument. BUG=None TBR=ben@chromium.org Review URL: https://codereview.chromium.org/1179733005 Cr-Commit-Position: refs/heads/master@{#334204}
Diffstat (limited to 'third_party/mojo/mojo_edk_system_impl.gypi')
-rw-r--r--third_party/mojo/mojo_edk_system_impl.gypi6
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/mojo/mojo_edk_system_impl.gypi b/third_party/mojo/mojo_edk_system_impl.gypi
index 069a53f..5bac8f3 100644
--- a/third_party/mojo/mojo_edk_system_impl.gypi
+++ b/third_party/mojo/mojo_edk_system_impl.gypi
@@ -52,8 +52,7 @@
'src/mojo/edk/system/channel_endpoint_client.h',
'src/mojo/edk/system/channel_endpoint_id.cc',
'src/mojo/edk/system/channel_endpoint_id.h',
- 'src/mojo/edk/system/channel_info.cc',
- 'src/mojo/edk/system/channel_info.h',
+ 'src/mojo/edk/system/channel_id.h',
'src/mojo/edk/system/channel_manager.cc',
'src/mojo/edk/system/channel_manager.h',
'src/mojo/edk/system/configuration.cc',
@@ -80,6 +79,8 @@
'src/mojo/edk/system/handle_table.h',
'src/mojo/edk/system/incoming_endpoint.cc',
'src/mojo/edk/system/incoming_endpoint.h',
+ 'src/mojo/edk/system/ipc_support.cc',
+ 'src/mojo/edk/system/ipc_support.h',
'src/mojo/edk/system/local_data_pipe_impl.cc',
'src/mojo/edk/system/local_data_pipe_impl.h',
'src/mojo/edk/system/local_message_pipe_endpoint.cc',
@@ -103,6 +104,7 @@
'src/mojo/edk/system/options_validation.h',
'src/mojo/edk/system/platform_handle_dispatcher.cc',
'src/mojo/edk/system/platform_handle_dispatcher.h',
+ 'src/mojo/edk/system/process_identifier.h',
'src/mojo/edk/system/proxy_message_pipe_endpoint.cc',
'src/mojo/edk/system/proxy_message_pipe_endpoint.h',
'src/mojo/edk/system/remote_consumer_data_pipe_impl.cc',