Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_base.gyp

Issue 623883002: Revert "Move mojo edk into mojo/edk" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/go/tests/system_test.go ('k') | mojo/nacl/monacl_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_base.gyp
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index fbc37302eda6f14de86164f0639380eb39477906..03d794885428f2449f62aff1385719de6824450f 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -87,7 +87,7 @@
],
},
{
- # GN version: //mojo/edk/system
+ # GN version: //mojo/system
'target_name': 'mojo_system_impl',
'type': '<(component)',
'dependencies': [
@@ -100,93 +100,93 @@
'MOJO_USE_SYSTEM_IMPL',
],
'sources': [
- 'edk/embedder/channel_init.cc',
- 'edk/embedder/channel_init.h',
- 'edk/embedder/embedder.cc',
- 'edk/embedder/embedder.h',
- 'edk/embedder/platform_channel_pair.cc',
- 'edk/embedder/platform_channel_pair.h',
- 'edk/embedder/platform_channel_pair_posix.cc',
- 'edk/embedder/platform_channel_pair_win.cc',
- 'edk/embedder/platform_channel_utils_posix.cc',
- 'edk/embedder/platform_channel_utils_posix.h',
- 'edk/embedder/platform_handle.cc',
- 'edk/embedder/platform_handle.h',
- 'edk/embedder/platform_handle_utils.h',
- 'edk/embedder/platform_handle_utils_posix.cc',
- 'edk/embedder/platform_handle_utils_win.cc',
- 'edk/embedder/platform_handle_vector.h',
- 'edk/embedder/platform_shared_buffer.h',
- 'edk/embedder/platform_support.h',
- 'edk/embedder/scoped_platform_handle.h',
- 'edk/embedder/simple_platform_shared_buffer.cc',
- 'edk/embedder/simple_platform_shared_buffer.h',
- 'edk/embedder/simple_platform_shared_buffer_posix.cc',
- 'edk/embedder/simple_platform_shared_buffer_win.cc',
- 'edk/embedder/simple_platform_support.cc',
- 'edk/embedder/simple_platform_support.h',
- 'edk/system/channel.cc',
- 'edk/system/channel.h',
- 'edk/system/channel_endpoint.cc',
- 'edk/system/channel_endpoint.h',
- 'edk/system/constants.h',
- 'edk/system/core.cc',
- 'edk/system/core.h',
- 'edk/system/data_pipe.cc',
- 'edk/system/data_pipe.h',
- 'edk/system/data_pipe_consumer_dispatcher.cc',
- 'edk/system/data_pipe_consumer_dispatcher.h',
- 'edk/system/data_pipe_producer_dispatcher.cc',
- 'edk/system/data_pipe_producer_dispatcher.h',
- 'edk/system/dispatcher.cc',
- 'edk/system/dispatcher.h',
- 'edk/system/entrypoints.cc',
- 'edk/system/handle_signals_state.h',
- 'edk/system/handle_table.cc',
- 'edk/system/handle_table.h',
- 'edk/system/local_data_pipe.cc',
- 'edk/system/local_data_pipe.h',
- 'edk/system/local_message_pipe_endpoint.cc',
- 'edk/system/local_message_pipe_endpoint.h',
- 'edk/system/mapping_table.cc',
- 'edk/system/mapping_table.h',
- 'edk/system/memory.cc',
- 'edk/system/memory.h',
- 'edk/system/message_in_transit.cc',
- 'edk/system/message_in_transit.h',
- 'edk/system/message_in_transit_queue.cc',
- 'edk/system/message_in_transit_queue.h',
- 'edk/system/message_pipe.cc',
- 'edk/system/message_pipe.h',
- 'edk/system/message_pipe_dispatcher.cc',
- 'edk/system/message_pipe_dispatcher.h',
- 'edk/system/message_pipe_endpoint.cc',
- 'edk/system/message_pipe_endpoint.h',
- 'edk/system/options_validation.h',
- 'edk/system/platform_handle_dispatcher.cc',
- 'edk/system/platform_handle_dispatcher.h',
- 'edk/system/proxy_message_pipe_endpoint.cc',
- 'edk/system/proxy_message_pipe_endpoint.h',
- 'edk/system/raw_channel.cc',
- 'edk/system/raw_channel.h',
- 'edk/system/raw_channel_posix.cc',
- 'edk/system/raw_channel_win.cc',
- 'edk/system/shared_buffer_dispatcher.cc',
- 'edk/system/shared_buffer_dispatcher.h',
- 'edk/system/simple_dispatcher.cc',
- 'edk/system/simple_dispatcher.h',
- 'edk/system/transport_data.cc',
- 'edk/system/transport_data.h',
- 'edk/system/waiter.cc',
- 'edk/system/waiter.h',
- 'edk/system/waiter_list.cc',
- 'edk/system/waiter_list.h',
+ 'embedder/channel_init.cc',
+ 'embedder/channel_init.h',
+ '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_channel_utils_posix.cc',
+ 'embedder/platform_channel_utils_posix.h',
+ 'embedder/platform_handle.cc',
+ 'embedder/platform_handle.h',
+ 'embedder/platform_handle_utils.h',
+ 'embedder/platform_handle_utils_posix.cc',
+ 'embedder/platform_handle_utils_win.cc',
+ 'embedder/platform_handle_vector.h',
+ 'embedder/platform_shared_buffer.h',
+ 'embedder/platform_support.h',
+ 'embedder/scoped_platform_handle.h',
+ 'embedder/simple_platform_shared_buffer.cc',
+ 'embedder/simple_platform_shared_buffer.h',
+ 'embedder/simple_platform_shared_buffer_posix.cc',
+ 'embedder/simple_platform_shared_buffer_win.cc',
+ 'embedder/simple_platform_support.cc',
+ 'embedder/simple_platform_support.h',
+ 'system/channel.cc',
+ 'system/channel.h',
+ 'system/channel_endpoint.cc',
+ 'system/channel_endpoint.h',
+ 'system/constants.h',
+ 'system/core.cc',
+ 'system/core.h',
+ 'system/data_pipe.cc',
+ 'system/data_pipe.h',
+ 'system/data_pipe_consumer_dispatcher.cc',
+ 'system/data_pipe_consumer_dispatcher.h',
+ 'system/data_pipe_producer_dispatcher.cc',
+ 'system/data_pipe_producer_dispatcher.h',
+ 'system/dispatcher.cc',
+ 'system/dispatcher.h',
+ 'system/entrypoints.cc',
+ 'system/handle_signals_state.h',
+ 'system/handle_table.cc',
+ 'system/handle_table.h',
+ 'system/local_data_pipe.cc',
+ 'system/local_data_pipe.h',
+ 'system/local_message_pipe_endpoint.cc',
+ 'system/local_message_pipe_endpoint.h',
+ 'system/mapping_table.cc',
+ 'system/mapping_table.h',
+ 'system/memory.cc',
+ 'system/memory.h',
+ 'system/message_in_transit.cc',
+ 'system/message_in_transit.h',
+ 'system/message_in_transit_queue.cc',
+ 'system/message_in_transit_queue.h',
+ 'system/message_pipe.cc',
+ 'system/message_pipe.h',
+ 'system/message_pipe_dispatcher.cc',
+ 'system/message_pipe_dispatcher.h',
+ 'system/message_pipe_endpoint.cc',
+ 'system/message_pipe_endpoint.h',
+ 'system/options_validation.h',
+ 'system/platform_handle_dispatcher.cc',
+ 'system/platform_handle_dispatcher.h',
+ 'system/proxy_message_pipe_endpoint.cc',
+ 'system/proxy_message_pipe_endpoint.h',
+ 'system/raw_channel.cc',
+ 'system/raw_channel.h',
+ 'system/raw_channel_posix.cc',
+ 'system/raw_channel_win.cc',
+ 'system/shared_buffer_dispatcher.cc',
+ 'system/shared_buffer_dispatcher.h',
+ 'system/simple_dispatcher.cc',
+ 'system/simple_dispatcher.h',
+ 'system/transport_data.cc',
+ 'system/transport_data.h',
+ 'system/waiter.cc',
+ 'system/waiter.h',
+ 'system/waiter_list.cc',
+ 'system/waiter_list.h',
# Test-only code:
# 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.
- 'edk/embedder/test_embedder.cc',
- 'edk/embedder/test_embedder.h',
+ 'embedder/test_embedder.cc',
+ 'embedder/test_embedder.h',
],
'all_dependent_settings': {
# Ensures that dependent projects import the core functions on Windows.
@@ -194,7 +194,7 @@
}
},
{
- # GN version: //mojo/edk/system:mojo_system_unittests
+ # GN version: //mojo/system:mojo_system_unittests
'target_name': 'mojo_system_unittests',
'type': 'executable',
'dependencies': [
@@ -204,47 +204,47 @@
'mojo_system_impl',
],
'sources': [
- 'edk/embedder/embedder_unittest.cc',
- 'edk/embedder/platform_channel_pair_posix_unittest.cc',
- 'edk/embedder/simple_platform_shared_buffer_unittest.cc',
- 'edk/system/channel_unittest.cc',
- 'edk/system/core_unittest.cc',
- 'edk/system/core_test_base.cc',
- 'edk/system/core_test_base.h',
- 'edk/system/data_pipe_unittest.cc',
- 'edk/system/dispatcher_unittest.cc',
- 'edk/system/local_data_pipe_unittest.cc',
- 'edk/system/memory_unittest.cc',
- 'edk/system/message_pipe_dispatcher_unittest.cc',
- 'edk/system/message_pipe_test_utils.h',
- 'edk/system/message_pipe_test_utils.cc',
- 'edk/system/message_pipe_unittest.cc',
- 'edk/system/multiprocess_message_pipe_unittest.cc',
- 'edk/system/options_validation_unittest.cc',
- 'edk/system/platform_handle_dispatcher_unittest.cc',
- 'edk/system/raw_channel_unittest.cc',
- 'edk/system/remote_message_pipe_unittest.cc',
- 'edk/system/run_all_unittests.cc',
- 'edk/system/shared_buffer_dispatcher_unittest.cc',
- 'edk/system/simple_dispatcher_unittest.cc',
- 'edk/system/test_utils.cc',
- 'edk/system/test_utils.h',
- 'edk/system/waiter_list_unittest.cc',
- 'edk/system/waiter_test_utils.cc',
- 'edk/system/waiter_test_utils.h',
- 'edk/system/waiter_unittest.cc',
+ 'embedder/embedder_unittest.cc',
+ 'embedder/platform_channel_pair_posix_unittest.cc',
+ 'embedder/simple_platform_shared_buffer_unittest.cc',
+ 'system/channel_unittest.cc',
+ 'system/core_unittest.cc',
+ 'system/core_test_base.cc',
+ 'system/core_test_base.h',
+ 'system/data_pipe_unittest.cc',
+ 'system/dispatcher_unittest.cc',
+ 'system/local_data_pipe_unittest.cc',
+ 'system/memory_unittest.cc',
+ 'system/message_pipe_dispatcher_unittest.cc',
+ 'system/message_pipe_test_utils.h',
+ 'system/message_pipe_test_utils.cc',
+ 'system/message_pipe_unittest.cc',
+ 'system/multiprocess_message_pipe_unittest.cc',
+ 'system/options_validation_unittest.cc',
+ 'system/platform_handle_dispatcher_unittest.cc',
+ 'system/raw_channel_unittest.cc',
+ 'system/remote_message_pipe_unittest.cc',
+ 'system/run_all_unittests.cc',
+ 'system/shared_buffer_dispatcher_unittest.cc',
+ 'system/simple_dispatcher_unittest.cc',
+ 'system/test_utils.cc',
+ 'system/test_utils.h',
+ 'system/waiter_list_unittest.cc',
+ 'system/waiter_test_utils.cc',
+ 'system/waiter_test_utils.h',
+ 'system/waiter_unittest.cc',
],
'conditions': [
['OS=="ios"', {
'sources!': [
- 'edk/embedder/embedder_unittest.cc',
- 'edk/system/multiprocess_message_pipe_unittest.cc',
+ 'embedder/embedder_unittest.cc',
+ 'system/multiprocess_message_pipe_unittest.cc',
],
}],
],
},
{
- # GN version: //mojo/edk/system:mojo_message_pipe_perftests
+ # GN version: //mojo/system:mojo_message_pipe_perftests
'target_name': 'mojo_message_pipe_perftests',
'type': 'executable',
'dependencies': [
@@ -257,11 +257,11 @@
'mojo_system_impl',
],
'sources': [
- 'edk/system/message_pipe_perftest.cc',
- 'edk/system/message_pipe_test_utils.h',
- 'edk/system/message_pipe_test_utils.cc',
- 'edk/system/test_utils.cc',
- 'edk/system/test_utils.h',
+ 'system/message_pipe_perftest.cc',
+ 'system/message_pipe_test_utils.h',
+ 'system/message_pipe_test_utils.cc',
+ 'system/test_utils.cc',
+ 'system/test_utils.h',
],
},
{
@@ -307,7 +307,7 @@
],
},
{
- # GN version: //mojo/edk/test:test_support
+ # GN version: //mojo/common/test:test_support
'target_name': 'mojo_common_test_support',
'type': 'static_library',
'dependencies': [
@@ -317,16 +317,16 @@
'mojo_system_impl',
],
'sources': [
- 'edk/test/multiprocess_test_helper.cc',
- 'edk/test/multiprocess_test_helper.h',
- 'edk/test/test_utils.h',
- 'edk/test/test_utils_posix.cc',
- 'edk/test/test_utils_win.cc',
+ 'common/test/multiprocess_test_helper.cc',
+ 'common/test/multiprocess_test_helper.h',
+ 'common/test/test_utils.h',
+ 'common/test/test_utils_posix.cc',
+ 'common/test/test_utils_win.cc',
],
'conditions': [
['OS=="ios"', {
'sources!': [
- 'edk/test/multiprocess_test_helper.cc',
+ 'common/test/multiprocess_test_helper.cc',
],
}],
],
@@ -351,12 +351,12 @@
'common/common_type_converters_unittest.cc',
'common/handle_watcher_unittest.cc',
'common/message_pump_mojo_unittest.cc',
- 'edk/test/multiprocess_test_helper_unittest.cc',
+ 'common/test/multiprocess_test_helper_unittest.cc',
],
'conditions': [
['OS=="ios"', {
'sources!': [
- 'edk/test/multiprocess_test_helper_unittest.cc',
+ 'common/test/multiprocess_test_helper_unittest.cc',
],
}],
],
« no previous file with comments | « mojo/go/tests/system_test.go ('k') | mojo/nacl/monacl_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698