| Index: mojo/mojo.gyp
|
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
|
| index 2643d10e2e91050e3c5f51634bef11538c80d44f..0c7580efa842213860d2c05f086da33595cfb736 100644
|
| --- a/mojo/mojo.gyp
|
| +++ b/mojo/mojo.gyp
|
| @@ -107,8 +107,14 @@
|
| 'system/data_pipe_producer_dispatcher.h',
|
| 'system/dispatcher.cc',
|
| 'system/dispatcher.h',
|
| - 'system/embedder.cc',
|
| - 'system/embedder.h',
|
| + 'system/embedder/embedder.cc',
|
| + 'system/embedder/embedder.h',
|
| + 'system/embedder/platform_channel_pair.cc',
|
| + 'system/embedder/platform_channel_pair.h',
|
| + 'system/embedder/platform_channel_pair_posix.cc',
|
| + 'system/embedder/platform_handle.cc',
|
| + 'system/embedder/platform_handle.h',
|
| + 'system/embedder/scoped_platform_handle.h',
|
| 'system/local_data_pipe.cc',
|
| 'system/local_data_pipe.h',
|
| 'system/local_message_pipe_endpoint.cc',
|
| @@ -123,17 +129,11 @@
|
| 'system/message_pipe_dispatcher.h',
|
| 'system/message_pipe_endpoint.cc',
|
| 'system/message_pipe_endpoint.h',
|
| - 'system/platform_channel_pair.cc',
|
| - 'system/platform_channel_pair.h',
|
| - 'system/platform_channel_pair_posix.cc',
|
| - 'system/platform_handle.cc',
|
| - 'system/platform_handle.h',
|
| 'system/proxy_message_pipe_endpoint.cc',
|
| 'system/proxy_message_pipe_endpoint.h',
|
| 'system/raw_channel.h',
|
| 'system/raw_channel_posix.cc',
|
| 'system/raw_channel_win.cc',
|
| - 'system/scoped_platform_handle.h',
|
| 'system/simple_dispatcher.cc',
|
| 'system/simple_dispatcher.h',
|
| 'system/waiter.cc',
|
| @@ -158,7 +158,7 @@
|
| 'system/core_test_base.h',
|
| 'system/data_pipe_unittest.cc',
|
| 'system/dispatcher_unittest.cc',
|
| - 'system/embedder_unittest.cc',
|
| + 'system/embedder/embedder_unittest.cc',
|
| 'system/local_data_pipe_unittest.cc',
|
| 'system/message_pipe_dispatcher_unittest.cc',
|
| 'system/message_pipe_unittest.cc',
|
| @@ -166,8 +166,10 @@
|
| 'system/raw_channel_posix_unittest.cc',
|
| 'system/remote_message_pipe_posix_unittest.cc',
|
| 'system/simple_dispatcher_unittest.cc',
|
| - 'system/test_embedder.cc',
|
| - 'system/test_embedder.h',
|
| + # TODO(vtl): Move this to mojo_system_impl (and mojo_system_impl's
|
| + # exports).
|
| + 'system/embedder/test_embedder.cc',
|
| + 'system/embedder/test_embedder.h',
|
| 'system/test_utils.cc',
|
| 'system/test_utils.h',
|
| 'system/waiter_list_unittest.cc',
|
|
|