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

Side by Side Diff: ppapi/native_client/native_client.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 unified diff | Download patch
« no previous file with comments | « ppapi/nacl_irt/plugin_startup.cc ('k') | ppapi/ppapi_internal.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'includes': [ 6 'includes': [
7 '../../build/common_untrusted.gypi', 7 '../../build/common_untrusted.gypi',
8 ], 8 ],
9 'conditions': [ 9 'conditions': [
10 ['disable_nacl==0 and disable_nacl_untrusted==0', { 10 ['disable_nacl==0 and disable_nacl_untrusted==0', {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 '-lcommand_buffer_client_nacl', 141 '-lcommand_buffer_client_nacl',
142 '-lcommand_buffer_common_nacl', 142 '-lcommand_buffer_common_nacl',
143 '-ltracing_nacl', 143 '-ltracing_nacl',
144 '-lgpu_ipc_nacl', 144 '-lgpu_ipc_nacl',
145 '-lipc_nacl', 145 '-lipc_nacl',
146 '-lbase_nacl', 146 '-lbase_nacl',
147 '-lshared_memory_support_nacl', 147 '-lshared_memory_support_nacl',
148 '-limc_syscalls', 148 '-limc_syscalls',
149 '-lplatform', 149 '-lplatform',
150 '-lgio', 150 '-lgio',
151 '-lmojo_cpp_bindings_nacl',
152 '-lmojo_cpp_system_nacl',
153 '-lmojo_public_system_nacl',
154 '-lmojo_system_impl_nacl',
155 '-Wl,--end-group', 151 '-Wl,--end-group',
156 '-lm', 152 '-lm',
157 ], 153 ],
158 'extra_args': [ 154 'extra_args': [
159 '--strip-all', 155 '--strip-all',
160 ], 156 ],
161 'conditions': [ 157 'conditions': [
162 # untrusted.gypi and build_nexe.py currently build 158 # untrusted.gypi and build_nexe.py currently build
163 # both x86-32 and x86-64 whenever target_arch is some 159 # both x86-32 and x86-64 whenever target_arch is some
164 # flavor of x86. However, on non-windows platforms 160 # flavor of x86. However, on non-windows platforms
(...skipping 21 matching lines...) Expand all
186 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', 182 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a',
187 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', 183 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a',
188 '>(tc_lib_dir_irt64)/libipc_nacl.a', 184 '>(tc_lib_dir_irt64)/libipc_nacl.a',
189 '>(tc_lib_dir_irt64)/libbase_nacl.a', 185 '>(tc_lib_dir_irt64)/libbase_nacl.a',
190 '>(tc_lib_dir_irt64)/libirt_browser.a', 186 '>(tc_lib_dir_irt64)/libirt_browser.a',
191 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', 187 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a',
192 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', 188 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a',
193 '>(tc_lib_dir_irt64)/libplatform.a', 189 '>(tc_lib_dir_irt64)/libplatform.a',
194 '>(tc_lib_dir_irt64)/libimc_syscalls.a', 190 '>(tc_lib_dir_irt64)/libimc_syscalls.a',
195 '>(tc_lib_dir_irt64)/libgio.a', 191 '>(tc_lib_dir_irt64)/libgio.a',
196 '>(tc_lib_dir_irt64)/libmojo_cpp_bindings_nacl.a',
197 '>(tc_lib_dir_irt64)/libmojo_cpp_system_nacl.a',
198 '>(tc_lib_dir_irt64)/libmojo_public_system_nacl.a',
199 '>(tc_lib_dir_irt64)/libmojo_system_impl_nacl.a',
200 ], 192 ],
201 'extra_deps_newlib32': [ 193 'extra_deps_newlib32': [
202 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', 194 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a',
203 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', 195 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a',
204 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', 196 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a',
205 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', 197 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a',
206 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', 198 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a',
207 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', 199 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a',
208 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', 200 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a',
209 '>(tc_lib_dir_irt32)/libtracing_nacl.a', 201 '>(tc_lib_dir_irt32)/libtracing_nacl.a',
210 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', 202 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a',
211 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', 203 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a',
212 '>(tc_lib_dir_irt32)/libipc_nacl.a', 204 '>(tc_lib_dir_irt32)/libipc_nacl.a',
213 '>(tc_lib_dir_irt32)/libbase_nacl.a', 205 '>(tc_lib_dir_irt32)/libbase_nacl.a',
214 '>(tc_lib_dir_irt32)/libirt_browser.a', 206 '>(tc_lib_dir_irt32)/libirt_browser.a',
215 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', 207 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a',
216 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', 208 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a',
217 '>(tc_lib_dir_irt32)/libplatform.a', 209 '>(tc_lib_dir_irt32)/libplatform.a',
218 '>(tc_lib_dir_irt32)/libimc_syscalls.a', 210 '>(tc_lib_dir_irt32)/libimc_syscalls.a',
219 '>(tc_lib_dir_irt32)/libgio.a', 211 '>(tc_lib_dir_irt32)/libgio.a',
220 '>(tc_lib_dir_irt32)/libmojo_cpp_bindings_nacl.a',
221 '>(tc_lib_dir_irt32)/libmojo_cpp_system_nacl.a',
222 '>(tc_lib_dir_irt32)/libmojo_public_system_nacl.a',
223 '>(tc_lib_dir_irt32)/libmojo_system_impl_nacl.a',
224 ], 212 ],
225 }], 213 }],
226 ['target_arch=="arm"', { 214 ['target_arch=="arm"', {
227 'extra_deps_arm': [ 215 'extra_deps_arm': [
228 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', 216 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a',
229 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', 217 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a',
230 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', 218 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a',
231 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', 219 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a',
232 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', 220 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a',
233 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', 221 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a',
234 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', 222 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a',
235 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', 223 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a',
236 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', 224 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a',
237 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', 225 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a',
238 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', 226 '>(tc_lib_dir_irt_arm)/libipc_nacl.a',
239 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', 227 '>(tc_lib_dir_irt_arm)/libbase_nacl.a',
240 '>(tc_lib_dir_irt_arm)/libirt_browser.a', 228 '>(tc_lib_dir_irt_arm)/libirt_browser.a',
241 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', 229 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a',
242 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', 230 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a',
243 '>(tc_lib_dir_irt_arm)/libplatform.a', 231 '>(tc_lib_dir_irt_arm)/libplatform.a',
244 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', 232 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a',
245 '>(tc_lib_dir_irt_arm)/libgio.a', 233 '>(tc_lib_dir_irt_arm)/libgio.a',
246 '>(tc_lib_dir_irt_arm)/libmojo_cpp_bindings_nacl.a',
247 '>(tc_lib_dir_irt_arm)/libmojo_cpp_system_nacl.a',
248 '>(tc_lib_dir_irt_arm)/libmojo_public_system_nacl.a',
249 '>(tc_lib_dir_irt_arm)/libmojo_system_impl_nacl.a',
250 ], 234 ],
251 }], 235 }],
252 ['target_arch=="mipsel"', { 236 ['target_arch=="mipsel"', {
253 'extra_deps_mips': [ 237 'extra_deps_mips': [
254 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', 238 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a',
255 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', 239 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a',
256 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', 240 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a',
257 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', 241 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a',
258 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', 242 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a',
259 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', 243 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a',
260 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', 244 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a',
261 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', 245 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a',
262 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', 246 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a',
263 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', 247 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a',
264 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', 248 '>(tc_lib_dir_irt_mips)/libipc_nacl.a',
265 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', 249 '>(tc_lib_dir_irt_mips)/libbase_nacl.a',
266 '>(tc_lib_dir_irt_mips)/libirt_browser.a', 250 '>(tc_lib_dir_irt_mips)/libirt_browser.a',
267 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', 251 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a',
268 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', 252 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a',
269 '>(tc_lib_dir_irt_mips)/libplatform.a', 253 '>(tc_lib_dir_irt_mips)/libplatform.a',
270 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', 254 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a',
271 '>(tc_lib_dir_irt_mips)/libgio.a', 255 '>(tc_lib_dir_irt_mips)/libgio.a',
272 '>(tc_lib_dir_irt_mips)/libmojo_cpp_bindings_nacl.a',
273 '>(tc_lib_dir_irt_mips)/libmojo_cpp_system_nacl.a',
274 '>(tc_lib_dir_irt_mips)/libmojo_public_system_nacl.a',
275 '>(tc_lib_dir_irt_mips)/libmojo_system_impl_nacl.a',
276 ], 256 ],
277 }], 257 }],
278 ], 258 ],
279 }, 259 },
280 'dependencies': [ 260 'dependencies': [
281 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt', 261 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt',
282 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', 262 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
283 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl', 263 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
284 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl', 264 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl',
285 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', 265 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
286 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', 266 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
287 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', 267 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
288 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', 268 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
289 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', 269 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
290 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', 270 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
291 '../../components/tracing_nacl.gyp:tracing_nacl', 271 '../../components/tracing_nacl.gyp:tracing_nacl',
292 '../../ipc/ipc_nacl.gyp:ipc_nacl', 272 '../../ipc/ipc_nacl.gyp:ipc_nacl',
293 '../../base/base_nacl.gyp:base_nacl', 273 '../../base/base_nacl.gyp:base_nacl',
294 '../../media/media_nacl.gyp:shared_memory_support_nacl', 274 '../../media/media_nacl.gyp:shared_memory_support_nacl',
295 '../../mojo/mojo_edk_nacl.gyp:mojo_system_impl_nacl',
296 '../../mojo/mojo_public_nacl.gyp:mojo_cpp_bindings_nacl',
297 '../../mojo/mojo_public_nacl.gyp:mojo_cpp_system_nacl',
298 '../../mojo/mojo_public_nacl.gyp:mojo_public_system_nacl',
299 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', 275 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
300 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 276 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
301 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', 277 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
302 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 278 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
303 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 279 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
304 ], 280 ],
305 }, 281 },
306 ], 282 ],
307 }], 283 }],
308 ], 284 ],
309 } 285 }
OLDNEW
« no previous file with comments | « ppapi/nacl_irt/plugin_startup.cc ('k') | ppapi/ppapi_internal.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698