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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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', |
151 '-Wl,--end-group', | 155 '-Wl,--end-group', |
152 '-lm', | 156 '-lm', |
153 ], | 157 ], |
154 'extra_args': [ | 158 'extra_args': [ |
155 '--strip-all', | 159 '--strip-all', |
156 ], | 160 ], |
157 'conditions': [ | 161 'conditions': [ |
158 # untrusted.gypi and build_nexe.py currently build | 162 # untrusted.gypi and build_nexe.py currently build |
159 # both x86-32 and x86-64 whenever target_arch is some | 163 # both x86-32 and x86-64 whenever target_arch is some |
160 # flavor of x86. However, on non-windows platforms | 164 # flavor of x86. However, on non-windows platforms |
(...skipping 21 matching lines...) Expand all Loading... |
182 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', | 186 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', |
183 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', | 187 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', |
184 '>(tc_lib_dir_irt64)/libipc_nacl.a', | 188 '>(tc_lib_dir_irt64)/libipc_nacl.a', |
185 '>(tc_lib_dir_irt64)/libbase_nacl.a', | 189 '>(tc_lib_dir_irt64)/libbase_nacl.a', |
186 '>(tc_lib_dir_irt64)/libirt_browser.a', | 190 '>(tc_lib_dir_irt64)/libirt_browser.a', |
187 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', | 191 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', |
188 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', | 192 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', |
189 '>(tc_lib_dir_irt64)/libplatform.a', | 193 '>(tc_lib_dir_irt64)/libplatform.a', |
190 '>(tc_lib_dir_irt64)/libimc_syscalls.a', | 194 '>(tc_lib_dir_irt64)/libimc_syscalls.a', |
191 '>(tc_lib_dir_irt64)/libgio.a', | 195 '>(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', |
192 ], | 200 ], |
193 'extra_deps_newlib32': [ | 201 'extra_deps_newlib32': [ |
194 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', | 202 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', |
195 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', | 203 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', |
196 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', | 204 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', |
197 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', | 205 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', |
198 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', | 206 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', |
199 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', | 207 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', |
200 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', | 208 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', |
201 '>(tc_lib_dir_irt32)/libtracing_nacl.a', | 209 '>(tc_lib_dir_irt32)/libtracing_nacl.a', |
202 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', | 210 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', |
203 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', | 211 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', |
204 '>(tc_lib_dir_irt32)/libipc_nacl.a', | 212 '>(tc_lib_dir_irt32)/libipc_nacl.a', |
205 '>(tc_lib_dir_irt32)/libbase_nacl.a', | 213 '>(tc_lib_dir_irt32)/libbase_nacl.a', |
206 '>(tc_lib_dir_irt32)/libirt_browser.a', | 214 '>(tc_lib_dir_irt32)/libirt_browser.a', |
207 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', | 215 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', |
208 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', | 216 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', |
209 '>(tc_lib_dir_irt32)/libplatform.a', | 217 '>(tc_lib_dir_irt32)/libplatform.a', |
210 '>(tc_lib_dir_irt32)/libimc_syscalls.a', | 218 '>(tc_lib_dir_irt32)/libimc_syscalls.a', |
211 '>(tc_lib_dir_irt32)/libgio.a', | 219 '>(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', |
212 ], | 224 ], |
213 }], | 225 }], |
214 ['target_arch=="arm"', { | 226 ['target_arch=="arm"', { |
215 'extra_deps_arm': [ | 227 'extra_deps_arm': [ |
216 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', | 228 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', |
217 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', | 229 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', |
218 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', | 230 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', |
219 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', | 231 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', |
220 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', | 232 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', |
221 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', | 233 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', |
222 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', | 234 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', |
223 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', | 235 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', |
224 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', | 236 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', |
225 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', | 237 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', |
226 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', | 238 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', |
227 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', | 239 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', |
228 '>(tc_lib_dir_irt_arm)/libirt_browser.a', | 240 '>(tc_lib_dir_irt_arm)/libirt_browser.a', |
229 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', | 241 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', |
230 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', | 242 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', |
231 '>(tc_lib_dir_irt_arm)/libplatform.a', | 243 '>(tc_lib_dir_irt_arm)/libplatform.a', |
232 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', | 244 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', |
233 '>(tc_lib_dir_irt_arm)/libgio.a', | 245 '>(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', |
234 ], | 250 ], |
235 }], | 251 }], |
236 ['target_arch=="mipsel"', { | 252 ['target_arch=="mipsel"', { |
237 'extra_deps_mips': [ | 253 'extra_deps_mips': [ |
238 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', | 254 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', |
239 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', | 255 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', |
240 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', | 256 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', |
241 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', | 257 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', |
242 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', | 258 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', |
243 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', | 259 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', |
244 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', | 260 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', |
245 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', | 261 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', |
246 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', | 262 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', |
247 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', | 263 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', |
248 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', | 264 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', |
249 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', | 265 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', |
250 '>(tc_lib_dir_irt_mips)/libirt_browser.a', | 266 '>(tc_lib_dir_irt_mips)/libirt_browser.a', |
251 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', | 267 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', |
252 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', | 268 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', |
253 '>(tc_lib_dir_irt_mips)/libplatform.a', | 269 '>(tc_lib_dir_irt_mips)/libplatform.a', |
254 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', | 270 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', |
255 '>(tc_lib_dir_irt_mips)/libgio.a', | 271 '>(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', |
256 ], | 276 ], |
257 }], | 277 }], |
258 ], | 278 ], |
259 }, | 279 }, |
260 'dependencies': [ | 280 'dependencies': [ |
261 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt', | 281 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt', |
262 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', | 282 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', |
263 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl', | 283 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl', |
264 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl', | 284 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl', |
265 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', | 285 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', |
266 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', | 286 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', |
267 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', | 287 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', |
268 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', | 288 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', |
269 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', | 289 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', |
270 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', | 290 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', |
271 '../../components/tracing_nacl.gyp:tracing_nacl', | 291 '../../components/tracing_nacl.gyp:tracing_nacl', |
272 '../../ipc/ipc_nacl.gyp:ipc_nacl', | 292 '../../ipc/ipc_nacl.gyp:ipc_nacl', |
273 '../../base/base_nacl.gyp:base_nacl', | 293 '../../base/base_nacl.gyp:base_nacl', |
274 '../../media/media_nacl.gyp:shared_memory_support_nacl', | 294 '../../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', |
275 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', | 299 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', |
276 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 300 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
277 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', | 301 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', |
278 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 302 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
279 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 303 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
280 ], | 304 ], |
281 }, | 305 }, |
282 ], | 306 ], |
283 }], | 307 }], |
284 ], | 308 ], |
285 } | 309 } |
OLD | NEW |