| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 '-lppapi_ipc_nacl', | 137 '-lppapi_ipc_nacl', |
| 138 '-lppapi_shared_nacl', | 138 '-lppapi_shared_nacl', |
| 139 '-lgles2_implementation_nacl', | 139 '-lgles2_implementation_nacl', |
| 140 '-lgles2_cmd_helper_nacl', | 140 '-lgles2_cmd_helper_nacl', |
| 141 '-lgles2_utils_nacl', | 141 '-lgles2_utils_nacl', |
| 142 '-lcommand_buffer_client_nacl', | 142 '-lcommand_buffer_client_nacl', |
| 143 '-lcommand_buffer_common_nacl', | 143 '-lcommand_buffer_common_nacl', |
| 144 '-ltracing_nacl', | 144 '-ltracing_nacl', |
| 145 '-lgpu_ipc_nacl', | 145 '-lgpu_ipc_nacl', |
| 146 '-lipc_nacl', | 146 '-lipc_nacl', |
| 147 '-lcrypto_nacl', | |
| 148 '-lbase_nacl', | 147 '-lbase_nacl', |
| 149 '-lshared_memory_support_nacl', | 148 '-lshared_memory_support_nacl', |
| 150 '-lsrpc', | 149 '-lsrpc', |
| 151 '-limc_syscalls', | 150 '-limc_syscalls', |
| 152 '-lplatform', | 151 '-lplatform', |
| 153 '-lgio', | 152 '-lgio', |
| 154 '-Wl,--end-group', | 153 '-Wl,--end-group', |
| 155 '-lm', | 154 '-lm', |
| 156 ], | 155 ], |
| 157 'extra_args': [ | 156 'extra_args': [ |
| (...skipping 21 matching lines...) Expand all Loading... |
| 179 '>(tc_lib_dir_irt64)/libppapi_ipc_nacl.a', | 178 '>(tc_lib_dir_irt64)/libppapi_ipc_nacl.a', |
| 180 '>(tc_lib_dir_irt64)/libppapi_shared_nacl.a', | 179 '>(tc_lib_dir_irt64)/libppapi_shared_nacl.a', |
| 181 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a', | 180 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a', |
| 182 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a', | 181 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a', |
| 183 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a', | 182 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a', |
| 184 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a', | 183 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a', |
| 185 '>(tc_lib_dir_irt64)/libtracing_nacl.a', | 184 '>(tc_lib_dir_irt64)/libtracing_nacl.a', |
| 186 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', | 185 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', |
| 187 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', | 186 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', |
| 188 '>(tc_lib_dir_irt64)/libipc_nacl.a', | 187 '>(tc_lib_dir_irt64)/libipc_nacl.a', |
| 189 '>(tc_lib_dir_irt64)/libcrypto_nacl.a', | |
| 190 '>(tc_lib_dir_irt64)/libbase_nacl.a', | 188 '>(tc_lib_dir_irt64)/libbase_nacl.a', |
| 191 '>(tc_lib_dir_irt64)/libirt_browser.a', | 189 '>(tc_lib_dir_irt64)/libirt_browser.a', |
| 192 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', | 190 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', |
| 193 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', | 191 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', |
| 194 '>(tc_lib_dir_irt64)/libsrpc.a', | 192 '>(tc_lib_dir_irt64)/libsrpc.a', |
| 195 '>(tc_lib_dir_irt64)/libplatform.a', | 193 '>(tc_lib_dir_irt64)/libplatform.a', |
| 196 '>(tc_lib_dir_irt64)/libimc_syscalls.a', | 194 '>(tc_lib_dir_irt64)/libimc_syscalls.a', |
| 197 '>(tc_lib_dir_irt64)/libgio.a', | 195 '>(tc_lib_dir_irt64)/libgio.a', |
| 198 ], | 196 ], |
| 199 'extra_deps_newlib32': [ | 197 'extra_deps_newlib32': [ |
| 200 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', | 198 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', |
| 201 '>(tc_lib_dir_irt32)/libmojo_irt.a', | 199 '>(tc_lib_dir_irt32)/libmojo_irt.a', |
| 202 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', | 200 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', |
| 203 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', | 201 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', |
| 204 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', | 202 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', |
| 205 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', | 203 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', |
| 206 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', | 204 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', |
| 207 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', | 205 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', |
| 208 '>(tc_lib_dir_irt32)/libtracing_nacl.a', | 206 '>(tc_lib_dir_irt32)/libtracing_nacl.a', |
| 209 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', | 207 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', |
| 210 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', | 208 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', |
| 211 '>(tc_lib_dir_irt32)/libipc_nacl.a', | 209 '>(tc_lib_dir_irt32)/libipc_nacl.a', |
| 212 '>(tc_lib_dir_irt32)/libcrypto_nacl.a', | |
| 213 '>(tc_lib_dir_irt32)/libbase_nacl.a', | 210 '>(tc_lib_dir_irt32)/libbase_nacl.a', |
| 214 '>(tc_lib_dir_irt32)/libirt_browser.a', | 211 '>(tc_lib_dir_irt32)/libirt_browser.a', |
| 215 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', | 212 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', |
| 216 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', | 213 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', |
| 217 '>(tc_lib_dir_irt32)/libsrpc.a', | 214 '>(tc_lib_dir_irt32)/libsrpc.a', |
| 218 '>(tc_lib_dir_irt32)/libplatform.a', | 215 '>(tc_lib_dir_irt32)/libplatform.a', |
| 219 '>(tc_lib_dir_irt32)/libimc_syscalls.a', | 216 '>(tc_lib_dir_irt32)/libimc_syscalls.a', |
| 220 '>(tc_lib_dir_irt32)/libgio.a', | 217 '>(tc_lib_dir_irt32)/libgio.a', |
| 221 ], | 218 ], |
| 222 }], | 219 }], |
| 223 ['target_arch=="arm"', { | 220 ['target_arch=="arm"', { |
| 224 'extra_deps_arm': [ | 221 'extra_deps_arm': [ |
| 225 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', | 222 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', |
| 226 '>(tc_lib_dir_irt_arm)/libmojo_irt.a', | 223 '>(tc_lib_dir_irt_arm)/libmojo_irt.a', |
| 227 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', | 224 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', |
| 228 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', | 225 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', |
| 229 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', | 226 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', |
| 230 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', | 227 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', |
| 231 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', | 228 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', |
| 232 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', | 229 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', |
| 233 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', | 230 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', |
| 234 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', | 231 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', |
| 235 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', | 232 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', |
| 236 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', | 233 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', |
| 237 '>(tc_lib_dir_irt_arm)/libcrypto_nacl.a', | |
| 238 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', | 234 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', |
| 239 '>(tc_lib_dir_irt_arm)/libirt_browser.a', | 235 '>(tc_lib_dir_irt_arm)/libirt_browser.a', |
| 240 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', | 236 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', |
| 241 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', | 237 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', |
| 242 '>(tc_lib_dir_irt_arm)/libsrpc.a', | 238 '>(tc_lib_dir_irt_arm)/libsrpc.a', |
| 243 '>(tc_lib_dir_irt_arm)/libplatform.a', | 239 '>(tc_lib_dir_irt_arm)/libplatform.a', |
| 244 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', | 240 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', |
| 245 '>(tc_lib_dir_irt_arm)/libgio.a', | 241 '>(tc_lib_dir_irt_arm)/libgio.a', |
| 246 ], | 242 ], |
| 247 }], | 243 }], |
| 248 ['target_arch=="mipsel"', { | 244 ['target_arch=="mipsel"', { |
| 249 'extra_deps_mips': [ | 245 'extra_deps_mips': [ |
| 250 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', | 246 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', |
| 251 '>(tc_lib_dir_irt_mips)/libmojo_irt.a', | 247 '>(tc_lib_dir_irt_mips)/libmojo_irt.a', |
| 252 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', | 248 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', |
| 253 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', | 249 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', |
| 254 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', | 250 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', |
| 255 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', | 251 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', |
| 256 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', | 252 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', |
| 257 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', | 253 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', |
| 258 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', | 254 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', |
| 259 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', | 255 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', |
| 260 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', | 256 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', |
| 261 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', | 257 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', |
| 262 '>(tc_lib_dir_irt_mips)/libcrypto_nacl.a', | |
| 263 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', | 258 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', |
| 264 '>(tc_lib_dir_irt_mips)/libirt_browser.a', | 259 '>(tc_lib_dir_irt_mips)/libirt_browser.a', |
| 265 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', | 260 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', |
| 266 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', | 261 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', |
| 267 '>(tc_lib_dir_irt_mips)/libsrpc.a', | 262 '>(tc_lib_dir_irt_mips)/libsrpc.a', |
| 268 '>(tc_lib_dir_irt_mips)/libplatform.a', | 263 '>(tc_lib_dir_irt_mips)/libplatform.a', |
| 269 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', | 264 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', |
| 270 '>(tc_lib_dir_irt_mips)/libgio.a', | 265 '>(tc_lib_dir_irt_mips)/libgio.a', |
| 271 ], | 266 ], |
| 272 }], | 267 }], |
| 273 ], | 268 ], |
| 274 }, | 269 }, |
| 275 'dependencies': [ | 270 'dependencies': [ |
| 276 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt', | 271 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt', |
| 277 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', | 272 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', |
| 278 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl', | 273 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl', |
| 279 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl', | 274 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl', |
| 280 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', | 275 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', |
| 281 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', | 276 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', |
| 282 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', | 277 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', |
| 283 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', | 278 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', |
| 284 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', | 279 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', |
| 285 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', | 280 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', |
| 286 '../../components/tracing_nacl.gyp:tracing_nacl', | 281 '../../components/tracing_nacl.gyp:tracing_nacl', |
| 287 '../../ipc/ipc_nacl.gyp:ipc_nacl', | 282 '../../ipc/ipc_nacl.gyp:ipc_nacl', |
| 288 '../../crypto/crypto_nacl.gyp:crypto_nacl', | |
| 289 '../../base/base_nacl.gyp:base_nacl', | 283 '../../base/base_nacl.gyp:base_nacl', |
| 290 '../../media/media_nacl.gyp:shared_memory_support_nacl', | 284 '../../media/media_nacl.gyp:shared_memory_support_nacl', |
| 291 '../../mojo/mojo_nacl_untrusted.gyp:libmojo_irt', | 285 '../../mojo/mojo_nacl_untrusted.gyp:libmojo_irt', |
| 292 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', | 286 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', |
| 293 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 287 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
| 294 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 288 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
| 295 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', | 289 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', |
| 296 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 290 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
| 297 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 291 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
| 298 ], | 292 ], |
| 299 }, | 293 }, |
| 300 ], | 294 ], |
| 301 }], | 295 }], |
| 302 ], | 296 ], |
| 303 } | 297 } |
| OLD | NEW |