Index: mojo/mojo.gyp |
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp |
index 48b51b58dfed914bc25cd2c259c28d4025e48ffe..d0ff90078b38e863a62059fb62e634d38d87f31d 100644 |
--- a/mojo/mojo.gyp |
+++ b/mojo/mojo.gyp |
@@ -103,6 +103,15 @@ |
'MOJO_SYSTEM_IMPL_IMPLEMENTATION', |
], |
'sources': [ |
+ 'embedder/embedder.cc', |
+ 'embedder/embedder.h', |
+ 'embedder/platform_channel_pair.cc', |
+ 'embedder/platform_channel_pair.h', |
+ 'embedder/platform_channel_pair_posix.cc', |
+ 'embedder/platform_channel_pair_win.cc', |
+ 'embedder/platform_handle.cc', |
+ 'embedder/platform_handle.h', |
+ 'embedder/scoped_platform_handle.h', |
'system/channel.cc', |
'system/channel.h', |
'system/constants.h', |
@@ -116,15 +125,6 @@ |
'system/data_pipe_producer_dispatcher.h', |
'system/dispatcher.cc', |
'system/dispatcher.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_channel_pair_win.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', |
@@ -157,8 +157,8 @@ |
# TODO(vtl): It's a little unfortunate that these end up in the same |
# component as non-test-only code. In the static build, this code should |
# hopefully be dead-stripped. |
- 'system/embedder/test_embedder.cc', |
- 'system/embedder/test_embedder.h', |
+ 'embedder/test_embedder.cc', |
+ 'embedder/test_embedder.h', |
], |
}, |
{ |
@@ -172,12 +172,12 @@ |
'mojo_system_impl', |
], |
'sources': [ |
+ 'embedder/embedder_unittest.cc', |
'system/core_impl_unittest.cc', |
'system/core_test_base.cc', |
'system/core_test_base.h', |
'system/data_pipe_unittest.cc', |
'system/dispatcher_unittest.cc', |
- 'system/embedder/embedder_unittest.cc', |
'system/local_data_pipe_unittest.cc', |
'system/message_pipe_dispatcher_unittest.cc', |
'system/message_pipe_unittest.cc', |