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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 '-lppapi_ipc_nacl', | 136 '-lppapi_ipc_nacl', |
137 '-lppapi_shared_nacl', | 137 '-lppapi_shared_nacl', |
138 '-lgles2_implementation_nacl', | 138 '-lgles2_implementation_nacl', |
139 '-lgles2_cmd_helper_nacl', | 139 '-lgles2_cmd_helper_nacl', |
140 '-lgles2_utils_nacl', | 140 '-lgles2_utils_nacl', |
| 141 '-lgfx_geometry_nacl', |
| 142 '-lgfx_ipc_geometry_nacl', |
141 '-lcommand_buffer_client_nacl', | 143 '-lcommand_buffer_client_nacl', |
142 '-lcommand_buffer_common_nacl', | 144 '-lcommand_buffer_common_nacl', |
143 '-ltracing_nacl', | 145 '-ltracing_nacl', |
144 '-lgpu_ipc_nacl', | 146 '-lgpu_ipc_nacl', |
145 '-lipc_nacl', | 147 '-lipc_nacl', |
146 '-lbase_nacl', | 148 '-lbase_nacl', |
147 '-lshared_memory_support_nacl', | 149 '-lshared_memory_support_nacl', |
148 '-limc_syscalls', | 150 '-limc_syscalls', |
149 '-lplatform', | 151 '-lplatform', |
150 '-lgio', | 152 '-lgio', |
(...skipping 27 matching lines...) Expand all Loading... |
178 '>(tc_lib_dir_irt64)/libppapi_proxy_nacl.a', | 180 '>(tc_lib_dir_irt64)/libppapi_proxy_nacl.a', |
179 '>(tc_lib_dir_irt64)/libppapi_ipc_nacl.a', | 181 '>(tc_lib_dir_irt64)/libppapi_ipc_nacl.a', |
180 '>(tc_lib_dir_irt64)/libppapi_shared_nacl.a', | 182 '>(tc_lib_dir_irt64)/libppapi_shared_nacl.a', |
181 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a', | 183 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a', |
182 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a', | 184 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a', |
183 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a', | 185 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a', |
184 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a', | 186 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a', |
185 '>(tc_lib_dir_irt64)/libtracing_nacl.a', | 187 '>(tc_lib_dir_irt64)/libtracing_nacl.a', |
186 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', | 188 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', |
187 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', | 189 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', |
| 190 '>(tc_lib_dir_irt64)/libgfx_geometry_nacl.a', |
| 191 '>(tc_lib_dir_irt64)/libgfx_ipc_geometry_nacl.a', |
188 '>(tc_lib_dir_irt64)/libipc_nacl.a', | 192 '>(tc_lib_dir_irt64)/libipc_nacl.a', |
189 '>(tc_lib_dir_irt64)/libbase_nacl.a', | 193 '>(tc_lib_dir_irt64)/libbase_nacl.a', |
190 '>(tc_lib_dir_irt64)/libirt_browser.a', | 194 '>(tc_lib_dir_irt64)/libirt_browser.a', |
191 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', | 195 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', |
192 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', | 196 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', |
193 '>(tc_lib_dir_irt64)/libplatform.a', | 197 '>(tc_lib_dir_irt64)/libplatform.a', |
194 '>(tc_lib_dir_irt64)/libimc_syscalls.a', | 198 '>(tc_lib_dir_irt64)/libimc_syscalls.a', |
195 '>(tc_lib_dir_irt64)/libgio.a', | 199 '>(tc_lib_dir_irt64)/libgio.a', |
196 '>(tc_lib_dir_irt64)/libmojo_cpp_bindings_nacl.a', | 200 '>(tc_lib_dir_irt64)/libmojo_cpp_bindings_nacl.a', |
197 '>(tc_lib_dir_irt64)/libmojo_cpp_system_nacl.a', | 201 '>(tc_lib_dir_irt64)/libmojo_cpp_system_nacl.a', |
198 '>(tc_lib_dir_irt64)/libmojo_public_system_nacl.a', | 202 '>(tc_lib_dir_irt64)/libmojo_public_system_nacl.a', |
199 '>(tc_lib_dir_irt64)/libmojo_system_impl_nacl.a', | 203 '>(tc_lib_dir_irt64)/libmojo_system_impl_nacl.a', |
200 ], | 204 ], |
201 'extra_deps_newlib32': [ | 205 'extra_deps_newlib32': [ |
202 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', | 206 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', |
203 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', | 207 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', |
204 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', | 208 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', |
205 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', | 209 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', |
206 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', | 210 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', |
207 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', | 211 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', |
208 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', | 212 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', |
209 '>(tc_lib_dir_irt32)/libtracing_nacl.a', | 213 '>(tc_lib_dir_irt32)/libtracing_nacl.a', |
210 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', | 214 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', |
211 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', | 215 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', |
| 216 '>(tc_lib_dir_irt32)/libgfx_geometry_nacl.a', |
| 217 '>(tc_lib_dir_irt32)/libgfx_ipc_geometry_nacl.a', |
212 '>(tc_lib_dir_irt32)/libipc_nacl.a', | 218 '>(tc_lib_dir_irt32)/libipc_nacl.a', |
213 '>(tc_lib_dir_irt32)/libbase_nacl.a', | 219 '>(tc_lib_dir_irt32)/libbase_nacl.a', |
214 '>(tc_lib_dir_irt32)/libirt_browser.a', | 220 '>(tc_lib_dir_irt32)/libirt_browser.a', |
215 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', | 221 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', |
216 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', | 222 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', |
217 '>(tc_lib_dir_irt32)/libplatform.a', | 223 '>(tc_lib_dir_irt32)/libplatform.a', |
218 '>(tc_lib_dir_irt32)/libimc_syscalls.a', | 224 '>(tc_lib_dir_irt32)/libimc_syscalls.a', |
219 '>(tc_lib_dir_irt32)/libgio.a', | 225 '>(tc_lib_dir_irt32)/libgio.a', |
220 '>(tc_lib_dir_irt32)/libmojo_cpp_bindings_nacl.a', | 226 '>(tc_lib_dir_irt32)/libmojo_cpp_bindings_nacl.a', |
221 '>(tc_lib_dir_irt32)/libmojo_cpp_system_nacl.a', | 227 '>(tc_lib_dir_irt32)/libmojo_cpp_system_nacl.a', |
222 '>(tc_lib_dir_irt32)/libmojo_public_system_nacl.a', | 228 '>(tc_lib_dir_irt32)/libmojo_public_system_nacl.a', |
223 '>(tc_lib_dir_irt32)/libmojo_system_impl_nacl.a', | 229 '>(tc_lib_dir_irt32)/libmojo_system_impl_nacl.a', |
224 ], | 230 ], |
225 }], | 231 }], |
226 ['target_arch=="arm"', { | 232 ['target_arch=="arm"', { |
227 'extra_deps_arm': [ | 233 'extra_deps_arm': [ |
228 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', | 234 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', |
229 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', | 235 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', |
230 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', | 236 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', |
231 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', | 237 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', |
232 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', | 238 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', |
233 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', | 239 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', |
234 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', | 240 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', |
235 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', | 241 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', |
236 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', | 242 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', |
237 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', | 243 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', |
| 244 '>(tc_lib_dir_irt_arm)/libgfx_geometry_nacl.a', |
| 245 '>(tc_lib_dir_irt_arm)/libgfx_ipc_geometry_nacl.a', |
238 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', | 246 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', |
239 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', | 247 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', |
240 '>(tc_lib_dir_irt_arm)/libirt_browser.a', | 248 '>(tc_lib_dir_irt_arm)/libirt_browser.a', |
241 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', | 249 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', |
242 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', | 250 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', |
243 '>(tc_lib_dir_irt_arm)/libplatform.a', | 251 '>(tc_lib_dir_irt_arm)/libplatform.a', |
244 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', | 252 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', |
245 '>(tc_lib_dir_irt_arm)/libgio.a', | 253 '>(tc_lib_dir_irt_arm)/libgio.a', |
246 '>(tc_lib_dir_irt_arm)/libmojo_cpp_bindings_nacl.a', | 254 '>(tc_lib_dir_irt_arm)/libmojo_cpp_bindings_nacl.a', |
247 '>(tc_lib_dir_irt_arm)/libmojo_cpp_system_nacl.a', | 255 '>(tc_lib_dir_irt_arm)/libmojo_cpp_system_nacl.a', |
248 '>(tc_lib_dir_irt_arm)/libmojo_public_system_nacl.a', | 256 '>(tc_lib_dir_irt_arm)/libmojo_public_system_nacl.a', |
249 '>(tc_lib_dir_irt_arm)/libmojo_system_impl_nacl.a', | 257 '>(tc_lib_dir_irt_arm)/libmojo_system_impl_nacl.a', |
250 ], | 258 ], |
251 }], | 259 }], |
252 ['target_arch=="mipsel"', { | 260 ['target_arch=="mipsel"', { |
253 'extra_deps_mips': [ | 261 'extra_deps_mips': [ |
254 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', | 262 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', |
255 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', | 263 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', |
256 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', | 264 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', |
257 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', | 265 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', |
258 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', | 266 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', |
259 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', | 267 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', |
260 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', | 268 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', |
261 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', | 269 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', |
262 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', | 270 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', |
263 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', | 271 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', |
| 272 '>(tc_lib_dir_irt_mips)/libgfx_geometry_nacl.a', |
| 273 '>(tc_lib_dir_irt_mips)/libgfx_ipc_geometry_nacl.a', |
264 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', | 274 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', |
265 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', | 275 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', |
266 '>(tc_lib_dir_irt_mips)/libirt_browser.a', | 276 '>(tc_lib_dir_irt_mips)/libirt_browser.a', |
267 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', | 277 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', |
268 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', | 278 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', |
269 '>(tc_lib_dir_irt_mips)/libplatform.a', | 279 '>(tc_lib_dir_irt_mips)/libplatform.a', |
270 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', | 280 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', |
271 '>(tc_lib_dir_irt_mips)/libgio.a', | 281 '>(tc_lib_dir_irt_mips)/libgio.a', |
272 '>(tc_lib_dir_irt_mips)/libmojo_cpp_bindings_nacl.a', | 282 '>(tc_lib_dir_irt_mips)/libmojo_cpp_bindings_nacl.a', |
273 '>(tc_lib_dir_irt_mips)/libmojo_cpp_system_nacl.a', | 283 '>(tc_lib_dir_irt_mips)/libmojo_cpp_system_nacl.a', |
(...skipping 26 matching lines...) Expand all Loading... |
300 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 310 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
301 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', | 311 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', |
302 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 312 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
303 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 313 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
304 ], | 314 ], |
305 }, | 315 }, |
306 ], | 316 ], |
307 }], | 317 }], |
308 ], | 318 ], |
309 } | 319 } |
OLD | NEW |