| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 # This GYP file defines untrusted (NaCl) targets. All targets in this | 5 # This GYP file defines untrusted (NaCl) targets. All targets in this |
| 6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid | 6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid |
| 7 # requiring NaCl sources for building. | 7 # requiring NaCl sources for building. |
| 8 | 8 |
| 9 { | 9 { |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 ], | 50 ], |
| 51 }, | 51 }, |
| 52 'dependencies': [ | 52 'dependencies': [ |
| 53 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 53 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 54 ], | 54 ], |
| 55 }, | 55 }, |
| 56 { | 56 { |
| 57 'target_name': 'ppapi_nacl_tests', | 57 'target_name': 'ppapi_nacl_tests', |
| 58 'type': 'none', | 58 'type': 'none', |
| 59 'dependencies': [ | 59 'dependencies': [ |
| 60 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 60 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', | 61 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', |
| 62 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib', |
| 61 'ppapi_cpp_lib', | 63 'ppapi_cpp_lib', |
| 62 'native_client/native_client.gyp:ppapi_lib', | 64 'native_client/native_client.gyp:ppapi_lib', |
| 63 ], | 65 ], |
| 64 'variables': { | 66 'variables': { |
| 65 # This is user code (vs IRT code), so tls accesses do not | 67 # This is user code (vs IRT code), so tls accesses do not |
| 66 # need to be indirect through a function call. | 68 # need to be indirect through a function call. |
| 67 'newlib_tls_flags=': [], | 69 'newlib_tls_flags=': [], |
| 68 # TODO(bradnelson): Remove this compile flag once new nacl_rev is | 70 # TODO(bradnelson): Remove this compile flag once new nacl_rev is |
| 69 # above 9362. | 71 # above 9362. |
| 70 'compile_flags': [ | 72 'compile_flags': [ |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 '>@(_inputs)', | 282 '>@(_inputs)', |
| 281 '--output=>(nmf_pnacl)', | 283 '--output=>(nmf_pnacl)', |
| 282 ], | 284 ], |
| 283 }, | 285 }, |
| 284 ], | 286 ], |
| 285 }], | 287 }], |
| 286 ], | 288 ], |
| 287 }, | 289 }, |
| 288 ], | 290 ], |
| 289 } | 291 } |
| OLD | NEW |