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

Side by Side Diff: third_party/mojo/mojo_edk_system_impl.gypi

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « third_party/mojo/mojo_edk.gyp ('k') | third_party/mojo/mojo_edk_tests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # The dictionary here is defined for use by the "mojo_system_impl" and 5 # The dictionary here is defined for use by the "mojo_system_impl" and
6 # "mojo_system_impl_win64" targets in third_party/mojo/mojo_edk.gyp. It's define d in this 6 # "mojo_system_impl_win64" targets in third_party/mojo/mojo_edk.gyp. It's define d in this
7 # .gypi file so the sections aren't duplicated. 7 # .gypi file so the sections aren't duplicated.
8 { 8 {
9 'defines': [ 9 'defines': [
10 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', 10 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
11 'MOJO_SYSTEM_IMPLEMENTATION', 11 'MOJO_SYSTEM_IMPLEMENTATION',
12 'MOJO_USE_SYSTEM_IMPL', 12 'MOJO_USE_SYSTEM_IMPL',
13 ], 13 ],
14 'sources': [ 14 'sources': [
15 'src/mojo/edk/embedder/configuration.h', 15 'src/mojo/edk/embedder/configuration.h',
16 'src/mojo/edk/embedder/channel_info_forward.h', 16 'src/mojo/edk/embedder/channel_info_forward.h',
17 'src/mojo/edk/embedder/channel_init.cc',
18 'src/mojo/edk/embedder/channel_init.h',
19 'src/mojo/edk/embedder/embedder.cc', 17 'src/mojo/edk/embedder/embedder.cc',
20 'src/mojo/edk/embedder/embedder.h', 18 'src/mojo/edk/embedder/embedder.h',
21 'src/mojo/edk/embedder/embedder_internal.h', 19 'src/mojo/edk/embedder/embedder_internal.h',
22 'src/mojo/edk/embedder/entrypoints.cc', 20 'src/mojo/edk/embedder/entrypoints.cc',
23 'src/mojo/edk/embedder/platform_channel_pair.cc', 21 'src/mojo/edk/embedder/platform_channel_pair.cc',
24 'src/mojo/edk/embedder/platform_channel_pair.h', 22 'src/mojo/edk/embedder/platform_channel_pair.h',
25 'src/mojo/edk/embedder/platform_channel_pair_posix.cc', 23 'src/mojo/edk/embedder/platform_channel_pair_posix.cc',
26 'src/mojo/edk/embedder/platform_channel_pair_win.cc', 24 'src/mojo/edk/embedder/platform_channel_pair_win.cc',
27 'src/mojo/edk/embedder/platform_channel_utils_posix.cc', 25 'src/mojo/edk/embedder/platform_channel_utils_posix.cc',
28 'src/mojo/edk/embedder/platform_channel_utils_posix.h', 26 'src/mojo/edk/embedder/platform_channel_utils_posix.h',
(...skipping 28 matching lines...) Expand all
57 'src/mojo/edk/system/channel_info.cc', 55 'src/mojo/edk/system/channel_info.cc',
58 'src/mojo/edk/system/channel_info.h', 56 'src/mojo/edk/system/channel_info.h',
59 'src/mojo/edk/system/channel_manager.cc', 57 'src/mojo/edk/system/channel_manager.cc',
60 'src/mojo/edk/system/channel_manager.h', 58 'src/mojo/edk/system/channel_manager.h',
61 'src/mojo/edk/system/configuration.cc', 59 'src/mojo/edk/system/configuration.cc',
62 'src/mojo/edk/system/configuration.h', 60 'src/mojo/edk/system/configuration.h',
63 'src/mojo/edk/system/core.cc', 61 'src/mojo/edk/system/core.cc',
64 'src/mojo/edk/system/core.h', 62 'src/mojo/edk/system/core.h',
65 'src/mojo/edk/system/data_pipe.cc', 63 'src/mojo/edk/system/data_pipe.cc',
66 'src/mojo/edk/system/data_pipe.h', 64 'src/mojo/edk/system/data_pipe.h',
65 'src/mojo/edk/system/data_pipe_impl.h',
67 'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc', 66 'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc',
68 'src/mojo/edk/system/data_pipe_consumer_dispatcher.h', 67 'src/mojo/edk/system/data_pipe_consumer_dispatcher.h',
69 'src/mojo/edk/system/data_pipe_producer_dispatcher.cc', 68 'src/mojo/edk/system/data_pipe_producer_dispatcher.cc',
70 'src/mojo/edk/system/data_pipe_producer_dispatcher.h', 69 'src/mojo/edk/system/data_pipe_producer_dispatcher.h',
71 'src/mojo/edk/system/dispatcher.cc', 70 'src/mojo/edk/system/dispatcher.cc',
72 'src/mojo/edk/system/dispatcher.h', 71 'src/mojo/edk/system/dispatcher.h',
73 'src/mojo/edk/system/endpoint_relayer.cc', 72 'src/mojo/edk/system/endpoint_relayer.cc',
74 'src/mojo/edk/system/endpoint_relayer.h', 73 'src/mojo/edk/system/endpoint_relayer.h',
75 'src/mojo/edk/system/handle_signals_state.h', 74 'src/mojo/edk/system/handle_signals_state.h',
76 'src/mojo/edk/system/handle_table.cc', 75 'src/mojo/edk/system/handle_table.cc',
77 'src/mojo/edk/system/handle_table.h', 76 'src/mojo/edk/system/handle_table.h',
78 'src/mojo/edk/system/incoming_endpoint.cc', 77 'src/mojo/edk/system/incoming_endpoint.cc',
79 'src/mojo/edk/system/incoming_endpoint.h', 78 'src/mojo/edk/system/incoming_endpoint.h',
80 'src/mojo/edk/system/local_data_pipe.cc', 79 'src/mojo/edk/system/local_data_pipe_impl.cc',
81 'src/mojo/edk/system/local_data_pipe.h', 80 'src/mojo/edk/system/local_data_pipe_impl.h',
82 'src/mojo/edk/system/local_message_pipe_endpoint.cc', 81 'src/mojo/edk/system/local_message_pipe_endpoint.cc',
83 'src/mojo/edk/system/local_message_pipe_endpoint.h', 82 'src/mojo/edk/system/local_message_pipe_endpoint.h',
84 'src/mojo/edk/system/mapping_table.cc', 83 'src/mojo/edk/system/mapping_table.cc',
85 'src/mojo/edk/system/mapping_table.h', 84 'src/mojo/edk/system/mapping_table.h',
85 'src/mojo/edk/system/master_connection_manager.cc',
86 'src/mojo/edk/system/master_connection_manager.h',
86 'src/mojo/edk/system/memory.cc', 87 'src/mojo/edk/system/memory.cc',
87 'src/mojo/edk/system/memory.h', 88 'src/mojo/edk/system/memory.h',
88 'src/mojo/edk/system/message_in_transit.cc', 89 'src/mojo/edk/system/message_in_transit.cc',
89 'src/mojo/edk/system/message_in_transit.h', 90 'src/mojo/edk/system/message_in_transit.h',
90 'src/mojo/edk/system/message_in_transit_queue.cc', 91 'src/mojo/edk/system/message_in_transit_queue.cc',
91 'src/mojo/edk/system/message_in_transit_queue.h', 92 'src/mojo/edk/system/message_in_transit_queue.h',
92 'src/mojo/edk/system/message_pipe.cc', 93 'src/mojo/edk/system/message_pipe.cc',
93 'src/mojo/edk/system/message_pipe.h', 94 'src/mojo/edk/system/message_pipe.h',
94 'src/mojo/edk/system/message_pipe_dispatcher.cc', 95 'src/mojo/edk/system/message_pipe_dispatcher.cc',
95 'src/mojo/edk/system/message_pipe_dispatcher.h', 96 'src/mojo/edk/system/message_pipe_dispatcher.h',
96 'src/mojo/edk/system/message_pipe_endpoint.cc', 97 'src/mojo/edk/system/message_pipe_endpoint.cc',
97 'src/mojo/edk/system/message_pipe_endpoint.h', 98 'src/mojo/edk/system/message_pipe_endpoint.h',
98 'src/mojo/edk/system/options_validation.h', 99 'src/mojo/edk/system/options_validation.h',
99 'src/mojo/edk/system/platform_handle_dispatcher.cc', 100 'src/mojo/edk/system/platform_handle_dispatcher.cc',
100 'src/mojo/edk/system/platform_handle_dispatcher.h', 101 'src/mojo/edk/system/platform_handle_dispatcher.h',
101 'src/mojo/edk/system/proxy_message_pipe_endpoint.cc', 102 'src/mojo/edk/system/proxy_message_pipe_endpoint.cc',
102 'src/mojo/edk/system/proxy_message_pipe_endpoint.h', 103 'src/mojo/edk/system/proxy_message_pipe_endpoint.h',
103 'src/mojo/edk/system/raw_channel.cc', 104 'src/mojo/edk/system/raw_channel.cc',
104 'src/mojo/edk/system/raw_channel.h', 105 'src/mojo/edk/system/raw_channel.h',
105 'src/mojo/edk/system/raw_channel_posix.cc', 106 'src/mojo/edk/system/raw_channel_posix.cc',
106 'src/mojo/edk/system/raw_channel_win.cc', 107 'src/mojo/edk/system/raw_channel_win.cc',
107 'src/mojo/edk/system/shared_buffer_dispatcher.cc', 108 'src/mojo/edk/system/shared_buffer_dispatcher.cc',
108 'src/mojo/edk/system/shared_buffer_dispatcher.h', 109 'src/mojo/edk/system/shared_buffer_dispatcher.h',
109 'src/mojo/edk/system/simple_dispatcher.cc', 110 'src/mojo/edk/system/simple_dispatcher.cc',
110 'src/mojo/edk/system/simple_dispatcher.h', 111 'src/mojo/edk/system/simple_dispatcher.h',
112 'src/mojo/edk/system/slave_connection_manager.cc',
113 'src/mojo/edk/system/slave_connection_manager.h',
111 'src/mojo/edk/system/transport_data.cc', 114 'src/mojo/edk/system/transport_data.cc',
112 'src/mojo/edk/system/transport_data.h', 115 'src/mojo/edk/system/transport_data.h',
116 'src/mojo/edk/system/unique_identifier.cc',
117 'src/mojo/edk/system/unique_identifier.h',
113 'src/mojo/edk/system/waiter.cc', 118 'src/mojo/edk/system/waiter.cc',
114 'src/mojo/edk/system/waiter.h', 119 'src/mojo/edk/system/waiter.h',
115 # Test-only code: 120 # Test-only code:
116 # TODO(vtl): It's a little unfortunate that these end up in the same 121 # TODO(vtl): It's a little unfortunate that these end up in the same
117 # component as non-test-only code. In the static build, this code 122 # component as non-test-only code. In the static build, this code
118 # should hopefully be dead-stripped. 123 # should hopefully be dead-stripped.
119 'src/mojo/edk/embedder/test_embedder.cc', 124 'src/mojo/edk/embedder/test_embedder.cc',
120 'src/mojo/edk/embedder/test_embedder.h', 125 'src/mojo/edk/embedder/test_embedder.h',
121 ], 126 ],
122 'all_dependent_settings': { 127 'all_dependent_settings': {
123 # Ensures that dependent projects import the core functions on Windows. 128 # Ensures that dependent projects import the core functions on Windows.
124 'defines': ['MOJO_USE_SYSTEM_IMPL'], 129 'defines': ['MOJO_USE_SYSTEM_IMPL'],
125 }, 130 },
126 'conditions': [ 131 'conditions': [
127 ['OS=="android"', { 132 ['OS=="android"', {
128 'dependencies': [ 133 'dependencies': [
129 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem', 134 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
130 ], 135 ],
131 }], 136 }],
132 ], 137 ],
133 } 138 }
OLDNEW
« no previous file with comments | « third_party/mojo/mojo_edk.gyp ('k') | third_party/mojo/mojo_edk_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698