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

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

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 'src/mojo/edk/system/channel_endpoint_id.cc', 53 'src/mojo/edk/system/channel_endpoint_id.cc',
54 'src/mojo/edk/system/channel_endpoint_id.h', 54 'src/mojo/edk/system/channel_endpoint_id.h',
55 'src/mojo/edk/system/channel_id.h', 55 'src/mojo/edk/system/channel_id.h',
56 'src/mojo/edk/system/channel_manager.cc', 56 'src/mojo/edk/system/channel_manager.cc',
57 'src/mojo/edk/system/channel_manager.h', 57 'src/mojo/edk/system/channel_manager.h',
58 'src/mojo/edk/system/configuration.cc', 58 'src/mojo/edk/system/configuration.cc',
59 'src/mojo/edk/system/configuration.h', 59 'src/mojo/edk/system/configuration.h',
60 'src/mojo/edk/system/connection_identifier.h', 60 'src/mojo/edk/system/connection_identifier.h',
61 'src/mojo/edk/system/connection_manager.cc', 61 'src/mojo/edk/system/connection_manager.cc',
62 'src/mojo/edk/system/connection_manager.h', 62 'src/mojo/edk/system/connection_manager.h',
63 'src/mojo/edk/system/connection_manager_messages.h',
63 'src/mojo/edk/system/core.cc', 64 'src/mojo/edk/system/core.cc',
64 'src/mojo/edk/system/core.h', 65 'src/mojo/edk/system/core.h',
65 'src/mojo/edk/system/data_pipe.cc', 66 'src/mojo/edk/system/data_pipe.cc',
66 'src/mojo/edk/system/data_pipe.h', 67 'src/mojo/edk/system/data_pipe.h',
67 'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc', 68 'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc',
68 'src/mojo/edk/system/data_pipe_consumer_dispatcher.h', 69 'src/mojo/edk/system/data_pipe_consumer_dispatcher.h',
69 'src/mojo/edk/system/data_pipe_impl.cc', 70 'src/mojo/edk/system/data_pipe_impl.cc',
70 'src/mojo/edk/system/data_pipe_impl.h', 71 'src/mojo/edk/system/data_pipe_impl.h',
71 'src/mojo/edk/system/data_pipe_producer_dispatcher.cc', 72 'src/mojo/edk/system/data_pipe_producer_dispatcher.cc',
72 'src/mojo/edk/system/data_pipe_producer_dispatcher.h', 73 'src/mojo/edk/system/data_pipe_producer_dispatcher.h',
(...skipping 21 matching lines...) Expand all
94 'src/mojo/edk/system/message_in_transit.cc', 95 'src/mojo/edk/system/message_in_transit.cc',
95 'src/mojo/edk/system/message_in_transit.h', 96 'src/mojo/edk/system/message_in_transit.h',
96 'src/mojo/edk/system/message_in_transit_queue.cc', 97 'src/mojo/edk/system/message_in_transit_queue.cc',
97 'src/mojo/edk/system/message_in_transit_queue.h', 98 'src/mojo/edk/system/message_in_transit_queue.h',
98 'src/mojo/edk/system/message_pipe.cc', 99 'src/mojo/edk/system/message_pipe.cc',
99 'src/mojo/edk/system/message_pipe.h', 100 'src/mojo/edk/system/message_pipe.h',
100 'src/mojo/edk/system/message_pipe_dispatcher.cc', 101 'src/mojo/edk/system/message_pipe_dispatcher.cc',
101 'src/mojo/edk/system/message_pipe_dispatcher.h', 102 'src/mojo/edk/system/message_pipe_dispatcher.h',
102 'src/mojo/edk/system/message_pipe_endpoint.cc', 103 'src/mojo/edk/system/message_pipe_endpoint.cc',
103 'src/mojo/edk/system/message_pipe_endpoint.h', 104 'src/mojo/edk/system/message_pipe_endpoint.h',
105 'src/mojo/edk/system/mutex.cc',
106 'src/mojo/edk/system/mutex.h',
104 'src/mojo/edk/system/options_validation.h', 107 'src/mojo/edk/system/options_validation.h',
105 'src/mojo/edk/system/platform_handle_dispatcher.cc', 108 'src/mojo/edk/system/platform_handle_dispatcher.cc',
106 'src/mojo/edk/system/platform_handle_dispatcher.h', 109 'src/mojo/edk/system/platform_handle_dispatcher.h',
107 'src/mojo/edk/system/process_identifier.h', 110 'src/mojo/edk/system/process_identifier.h',
108 'src/mojo/edk/system/proxy_message_pipe_endpoint.cc', 111 'src/mojo/edk/system/proxy_message_pipe_endpoint.cc',
109 'src/mojo/edk/system/proxy_message_pipe_endpoint.h', 112 'src/mojo/edk/system/proxy_message_pipe_endpoint.h',
110 'src/mojo/edk/system/remote_consumer_data_pipe_impl.cc', 113 'src/mojo/edk/system/remote_consumer_data_pipe_impl.cc',
111 'src/mojo/edk/system/remote_consumer_data_pipe_impl.h', 114 'src/mojo/edk/system/remote_consumer_data_pipe_impl.h',
112 'src/mojo/edk/system/remote_data_pipe_ack.h', 115 'src/mojo/edk/system/remote_data_pipe_ack.h',
113 'src/mojo/edk/system/remote_producer_data_pipe_impl.cc', 116 'src/mojo/edk/system/remote_producer_data_pipe_impl.cc',
114 'src/mojo/edk/system/remote_producer_data_pipe_impl.h', 117 'src/mojo/edk/system/remote_producer_data_pipe_impl.h',
115 'src/mojo/edk/system/raw_channel.cc', 118 'src/mojo/edk/system/raw_channel.cc',
116 'src/mojo/edk/system/raw_channel.h', 119 'src/mojo/edk/system/raw_channel.h',
117 'src/mojo/edk/system/raw_channel_posix.cc', 120 'src/mojo/edk/system/raw_channel_posix.cc',
118 'src/mojo/edk/system/raw_channel_win.cc', 121 'src/mojo/edk/system/raw_channel_win.cc',
119 'src/mojo/edk/system/shared_buffer_dispatcher.cc', 122 'src/mojo/edk/system/shared_buffer_dispatcher.cc',
120 'src/mojo/edk/system/shared_buffer_dispatcher.h', 123 'src/mojo/edk/system/shared_buffer_dispatcher.h',
121 'src/mojo/edk/system/simple_dispatcher.cc', 124 'src/mojo/edk/system/simple_dispatcher.cc',
122 'src/mojo/edk/system/simple_dispatcher.h', 125 'src/mojo/edk/system/simple_dispatcher.h',
123 'src/mojo/edk/system/slave_connection_manager.cc', 126 'src/mojo/edk/system/slave_connection_manager.cc',
124 'src/mojo/edk/system/slave_connection_manager.h', 127 'src/mojo/edk/system/slave_connection_manager.h',
128 'src/mojo/edk/system/thread_annotations.h',
125 'src/mojo/edk/system/transport_data.cc', 129 'src/mojo/edk/system/transport_data.cc',
126 'src/mojo/edk/system/transport_data.h', 130 'src/mojo/edk/system/transport_data.h',
127 'src/mojo/edk/system/unique_identifier.cc', 131 'src/mojo/edk/system/unique_identifier.cc',
128 'src/mojo/edk/system/unique_identifier.h', 132 'src/mojo/edk/system/unique_identifier.h',
129 'src/mojo/edk/system/waiter.cc', 133 'src/mojo/edk/system/waiter.cc',
130 'src/mojo/edk/system/waiter.h', 134 'src/mojo/edk/system/waiter.h',
131 # Test-only code: 135 # Test-only code:
132 # TODO(vtl): It's a little unfortunate that these end up in the same 136 # TODO(vtl): It's a little unfortunate that these end up in the same
133 # component as non-test-only code. In the static build, this code 137 # component as non-test-only code. In the static build, this code
134 # should hopefully be dead-stripped. 138 # should hopefully be dead-stripped.
135 'src/mojo/edk/embedder/test_embedder.cc', 139 'src/mojo/edk/embedder/test_embedder.cc',
136 'src/mojo/edk/embedder/test_embedder.h', 140 'src/mojo/edk/embedder/test_embedder.h',
137 ], 141 ],
138 'all_dependent_settings': { 142 'all_dependent_settings': {
139 # Ensures that dependent projects import the core functions on Windows. 143 # Ensures that dependent projects import the core functions on Windows.
140 'defines': ['MOJO_USE_SYSTEM_IMPL'], 144 'defines': ['MOJO_USE_SYSTEM_IMPL'],
141 }, 145 },
142 'conditions': [ 146 'conditions': [
143 ['OS=="android"', { 147 ['OS=="android"', {
144 'dependencies': [ 148 'dependencies': [
145 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem', 149 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
146 ], 150 ],
147 }], 151 }],
148 ], 152 ],
149 } 153 }
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