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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_edk.gyp

Issue 2067233002: Revert of Use Mojo pipes to signal sync IPC events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/edk/system/BUILD.gn ('k') | mojo/mojo_edk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_edk.gyp
diff --git a/mojo/mojo_edk.gyp b/mojo/mojo_edk.gyp
index 318a817ea85d62206ad3948261f45aaba85b4b60..fb281861b7ea86b94e66b3b862110255a1014a08 100644
--- a/mojo/mojo_edk.gyp
+++ b/mojo/mojo_edk.gyp
@@ -6,9 +6,6 @@
'variables': {
'chromium_code': 1,
},
- 'includes': [
- 'mojo_edk.gypi',
- ],
'target_defaults' : {
'include_dirs': [
'..',
@@ -30,7 +27,23 @@
'../crypto/crypto.gyp:crypto',
],
'sources': [
- '<@(mojo_edk_ports_sources)',
+ 'edk/system/ports/event.cc',
+ 'edk/system/ports/event.h',
+ 'edk/system/ports/message.cc',
+ 'edk/system/ports/message.h',
+ 'edk/system/ports/message_queue.cc',
+ 'edk/system/ports/message_queue.h',
+ 'edk/system/ports/name.cc',
+ 'edk/system/ports/name.h',
+ 'edk/system/ports/node.cc',
+ 'edk/system/ports/node.h',
+ 'edk/system/ports/node_delegate.h',
+ 'edk/system/ports/port.cc',
+ 'edk/system/ports/port.h',
+ 'edk/system/ports/port_ref.cc',
+ 'edk/system/ports/user_data.h',
+ 'edk/system/ports_message.cc',
+ 'edk/system/ports_message.h',
],
},
{
@@ -48,8 +61,90 @@
'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
],
'sources': [
- '<@(mojo_edk_system_impl_sources)',
- '<@(mojo_edk_system_impl_non_nacl_sources)',
+ 'edk/embedder/configuration.h',
+ 'edk/embedder/embedder.cc',
+ 'edk/embedder/embedder.h',
+ 'edk/embedder/embedder_internal.h',
+ 'edk/embedder/entrypoints.cc',
+ 'edk/embedder/named_platform_channel_pair_win.cc',
+ 'edk/embedder/named_platform_channel_pair_win.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.cc',
+ 'edk/embedder/platform_shared_buffer.h',
+ 'edk/embedder/scoped_platform_handle.h',
+ 'edk/system/awakable.h',
+ 'edk/system/awakable_list.cc',
+ 'edk/system/awakable_list.h',
+ 'edk/system/async_waiter.cc',
+ 'edk/system/async_waiter.h',
+ 'edk/system/atomic_flag.h',
+ 'edk/system/broker.h',
+ 'edk/system/broker_host.h',
+ 'edk/system/broker_host_posix.cc',
+ 'edk/system/broker_posix.cc',
+ 'edk/system/channel.cc',
+ 'edk/system/channel.h',
+ 'edk/system/channel_posix.cc',
+ 'edk/system/channel_win.cc',
+ 'edk/system/configuration.cc',
+ 'edk/system/configuration.h',
+ 'edk/system/core.cc',
+ 'edk/system/core.h',
+ 'edk/system/data_pipe_consumer_dispatcher.cc',
+ 'edk/system/data_pipe_consumer_dispatcher.h',
+ 'edk/system/data_pipe_control_message.cc',
+ 'edk/system/data_pipe_control_message.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/handle_signals_state.h',
+ 'edk/system/handle_table.cc',
+ 'edk/system/handle_table.h',
+ 'edk/system/mapping_table.cc',
+ 'edk/system/mapping_table.h',
+ 'edk/system/message_for_transit.cc',
+ 'edk/system/message_for_transit.h',
+ 'edk/system/message_pipe_dispatcher.cc',
+ 'edk/system/message_pipe_dispatcher.h',
+ 'edk/system/node_channel.cc',
+ 'edk/system/node_channel.h',
+ 'edk/system/node_controller.cc',
+ 'edk/system/node_controller.h',
+ 'edk/system/options_validation.h',
+ 'edk/system/platform_handle_dispatcher.cc',
+ 'edk/system/platform_handle_dispatcher.h',
+ 'edk/system/remote_message_pipe_bootstrap.cc',
+ 'edk/system/remote_message_pipe_bootstrap.h',
+ 'edk/system/request_context.cc',
+ 'edk/system/request_context.h',
+ 'edk/system/shared_buffer_dispatcher.cc',
+ 'edk/system/shared_buffer_dispatcher.h',
+ 'edk/system/wait_set_dispatcher.cc',
+ 'edk/system/wait_set_dispatcher.h',
+ 'edk/system/waiter.cc',
+ 'edk/system/waiter.h',
+ 'edk/system/watcher.cc',
+ 'edk/system/watcher.h',
+ 'edk/system/watcher_set.cc',
+ 'edk/system/watcher_set.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',
],
'conditions': [
['OS=="android"', {
@@ -178,55 +273,4 @@
],
},
],
- 'conditions': [
- ['OS == "win" and target_arch=="ia32"', {
- 'targets': [
- {
- # GN version: //mojo/edk/system/ports
- 'target_name': 'mojo_system_ports_win64',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base_win64',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
- '../crypto/crypto.gyp:crypto_nacl_win64',
- ],
- 'sources': [
- '<@(mojo_edk_ports_sources)',
- ],
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- },
- {
- # GN version: //mojo/edk/system
- 'target_name': 'mojo_system_impl_win64',
- 'type': '<(component)',
- 'dependencies': [
- '../base/base.gyp:base_win64',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
- '../crypto/crypto.gyp:crypto_nacl_win64',
- 'mojo_public.gyp:mojo_public_system_win64',
- 'mojo_system_ports_win64',
- ],
- 'defines': [
- 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
- ],
- 'sources': [
- '<@(mojo_edk_system_impl_sources)',
- '<@(mojo_edk_system_impl_non_nacl_sources)',
- ],
- # Structure was padded due to __declspec(align()), which is
- # uninteresting.
- 'msvs_disabled_warnings': [ 4324 ],
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- },
- ],
- }],
- ]
}
« no previous file with comments | « mojo/edk/system/BUILD.gn ('k') | mojo/mojo_edk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698