diff options
| author | rockot <rockot@chromium.org> | 2015-03-03 08:31:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-03 16:31:38 +0000 |
| commit | cbca72f3c9e31309a28b98624e1e0147c5dca7a1 (patch) | |
| tree | 1bde2f531bed308832135e8d66a784afb0e258b1 /third_party/mojo/mojo_edk_system_impl.gypi | |
| parent | 633e315de496ed52f2aed727ab36b23ea2fa3e87 (diff) | |
| download | chromium_src-cbca72f3c9e31309a28b98624e1e0147c5dca7a1.zip chromium_src-cbca72f3c9e31309a28b98624e1e0147c5dca7a1.tar.gz chromium_src-cbca72f3c9e31309a28b98624e1e0147c5dca7a1.tar.bz2 | |
Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819
Highlights:
- mojo::ChannelInit has been replaced with
content::ChannelInit.
- ScopedIPCSupport has been added so Mojo consumers can
ensure the EDK is initialized.
- single process mode now uses some evil tricks to get
child threads to create their mojo client channels on
the browser I/O thread.
- several Android bits adapted to new interfaces
- a number of tests have been adapted to work properly
in spite of unconventional process arrangements
BUG=None
Review URL: https://codereview.chromium.org/954643002
Cr-Commit-Position: refs/heads/master@{#318883}
Diffstat (limited to 'third_party/mojo/mojo_edk_system_impl.gypi')
| -rw-r--r-- | third_party/mojo/mojo_edk_system_impl.gypi | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/third_party/mojo/mojo_edk_system_impl.gypi b/third_party/mojo/mojo_edk_system_impl.gypi index 50991bf..62b8529 100644 --- a/third_party/mojo/mojo_edk_system_impl.gypi +++ b/third_party/mojo/mojo_edk_system_impl.gypi @@ -14,8 +14,6 @@ 'sources': [ 'src/mojo/edk/embedder/configuration.h', 'src/mojo/edk/embedder/channel_info_forward.h', - 'src/mojo/edk/embedder/channel_init.cc', - 'src/mojo/edk/embedder/channel_init.h', 'src/mojo/edk/embedder/embedder.cc', 'src/mojo/edk/embedder/embedder.h', 'src/mojo/edk/embedder/embedder_internal.h', @@ -64,6 +62,7 @@ 'src/mojo/edk/system/core.h', 'src/mojo/edk/system/data_pipe.cc', 'src/mojo/edk/system/data_pipe.h', + 'src/mojo/edk/system/data_pipe_impl.h', 'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc', 'src/mojo/edk/system/data_pipe_consumer_dispatcher.h', 'src/mojo/edk/system/data_pipe_producer_dispatcher.cc', @@ -77,12 +76,14 @@ '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/local_data_pipe.cc', - 'src/mojo/edk/system/local_data_pipe.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', 'src/mojo/edk/system/local_message_pipe_endpoint.h', 'src/mojo/edk/system/mapping_table.cc', 'src/mojo/edk/system/mapping_table.h', + 'src/mojo/edk/system/master_connection_manager.cc', + 'src/mojo/edk/system/master_connection_manager.h', 'src/mojo/edk/system/memory.cc', 'src/mojo/edk/system/memory.h', 'src/mojo/edk/system/message_in_transit.cc', @@ -108,8 +109,12 @@ 'src/mojo/edk/system/shared_buffer_dispatcher.h', 'src/mojo/edk/system/simple_dispatcher.cc', 'src/mojo/edk/system/simple_dispatcher.h', + 'src/mojo/edk/system/slave_connection_manager.cc', + 'src/mojo/edk/system/slave_connection_manager.h', 'src/mojo/edk/system/transport_data.cc', 'src/mojo/edk/system/transport_data.h', + 'src/mojo/edk/system/unique_identifier.cc', + 'src/mojo/edk/system/unique_identifier.h', 'src/mojo/edk/system/waiter.cc', 'src/mojo/edk/system/waiter.h', # Test-only code: |