OLD | NEW |
---|---|
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
126 'build_newlib': 0, | 126 'build_newlib': 0, |
127 'build_irt': 1, | 127 'build_irt': 1, |
128 'include_dirs': [ | 128 'include_dirs': [ |
129 '..', | 129 '..', |
130 ], | 130 ], |
131 'link_flags': [ | 131 'link_flags': [ |
132 '-Wl,--start-group', | 132 '-Wl,--start-group', |
133 '-lirt_browser', | 133 '-lirt_browser', |
134 '-lpnacl_irt_shim_for_irt', | 134 '-lpnacl_irt_shim_for_irt', |
135 '-lppapi_proxy_nacl', | 135 '-lppapi_proxy_nacl', |
136 '-lmojo_irt', | |
137 '-lppapi_ipc_nacl', | 136 '-lppapi_ipc_nacl', |
138 '-lppapi_shared_nacl', | 137 '-lppapi_shared_nacl', |
139 '-lgles2_implementation_nacl', | 138 '-lgles2_implementation_nacl', |
140 '-lgles2_cmd_helper_nacl', | 139 '-lgles2_cmd_helper_nacl', |
141 '-lgles2_utils_nacl', | 140 '-lgles2_utils_nacl', |
142 '-lcommand_buffer_client_nacl', | 141 '-lcommand_buffer_client_nacl', |
143 '-lcommand_buffer_common_nacl', | 142 '-lcommand_buffer_common_nacl', |
144 '-ltracing_nacl', | 143 '-ltracing_nacl', |
145 '-lgpu_ipc_nacl', | 144 '-lgpu_ipc_nacl', |
146 '-lipc_nacl', | 145 '-lipc_nacl', |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
237 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', | 236 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', |
238 '>(tc_lib_dir_irt_arm)/libsrpc.a', | 237 '>(tc_lib_dir_irt_arm)/libsrpc.a', |
239 '>(tc_lib_dir_irt_arm)/libplatform.a', | 238 '>(tc_lib_dir_irt_arm)/libplatform.a', |
240 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', | 239 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', |
241 '>(tc_lib_dir_irt_arm)/libgio.a', | 240 '>(tc_lib_dir_irt_arm)/libgio.a', |
242 ], | 241 ], |
243 }], | 242 }], |
244 ['target_arch=="mipsel"', { | 243 ['target_arch=="mipsel"', { |
245 'extra_deps_mips': [ | 244 'extra_deps_mips': [ |
246 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', | 245 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', |
247 '>(tc_lib_dir_irt_mips)/libmojo_irt.a', | 246 '>(tc_lib_dir_irt_mips)/libmojo_irt.a', |
Nick Bray (chromium)
2015/08/11 21:06:43
Delete this for each arch. "mojo" should appear n
Ken Rockot(use gerrit already)
2015/08/11 21:19:00
woops - thanks. done.
| |
248 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', | 247 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', |
249 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', | 248 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', |
250 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', | 249 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', |
251 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', | 250 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', |
252 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', | 251 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', |
253 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', | 252 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', |
254 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', | 253 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', |
255 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', | 254 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', |
256 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', | 255 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', |
257 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', | 256 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', |
(...skipping 17 matching lines...) Expand all Loading... | |
275 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', | 274 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', |
276 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', | 275 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', |
277 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', | 276 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', |
278 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', | 277 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', |
279 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', | 278 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', |
280 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', | 279 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', |
281 '../../components/tracing_nacl.gyp:tracing_nacl', | 280 '../../components/tracing_nacl.gyp:tracing_nacl', |
282 '../../ipc/ipc_nacl.gyp:ipc_nacl', | 281 '../../ipc/ipc_nacl.gyp:ipc_nacl', |
283 '../../base/base_nacl.gyp:base_nacl', | 282 '../../base/base_nacl.gyp:base_nacl', |
284 '../../media/media_nacl.gyp:shared_memory_support_nacl', | 283 '../../media/media_nacl.gyp:shared_memory_support_nacl', |
285 '../../mojo/mojo_nacl_untrusted.gyp:libmojo_irt', | |
286 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', | 284 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', |
287 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 285 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
288 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 286 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
289 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', | 287 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', |
290 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 288 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
291 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 289 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
292 ], | 290 ], |
293 }, | 291 }, |
294 ], | 292 ], |
295 }], | 293 }], |
296 ], | 294 ], |
297 } | 295 } |
OLD | NEW |