| 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', { |
| 11 'targets': [ | 11 'targets': [ |
| 12 { | 12 { |
| 13 'target_name': 'ppapi_lib', | 13 'target_name': 'ppapi_lib', |
| 14 'type': 'none', | 14 'type': 'none', |
| 15 'dependencies': [ | 15 'dependencies': [ |
| 16 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib'
, | 16 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib'
, |
| 17 'src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib', | 17 'src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib', |
| 18 ], | 18 ], |
| 19 'include_dirs': [ | 19 'include_dirs': [ |
| 20 '..', | 20 '..', |
| 21 ], | 21 ], |
| 22 'copies': [ | 22 'copies': [ |
| 23 { | 23 { |
| 24 'destination': '>(tc_include_dir_newlib)/nacl', | 24 'destination': '>(tc_include_dir_newlib)/nacl', |
| 25 'files': [ | 25 'files': [ |
| 26 'src/trusted/weak_ref/call_on_main_thread.h', | |
| 27 'src/shared/ppapi_proxy/ppruntime.h', | 26 'src/shared/ppapi_proxy/ppruntime.h', |
| 28 ], | 27 ], |
| 29 }, | 28 }, |
| 30 | 29 |
| 31 { | 30 { |
| 32 'destination': '>(tc_lib_dir_pnacl_newlib)', | 31 'destination': '>(tc_lib_dir_pnacl_newlib)', |
| 33 'files': [ | 32 'files': [ |
| 34 'src/untrusted/irt_stub/libppapi.a', | 33 'src/untrusted/irt_stub/libppapi.a', |
| 35 ], | 34 ], |
| 36 }, | 35 }, |
| 37 ], | 36 ], |
| 38 'conditions': [ | 37 'conditions': [ |
| 39 ['target_arch=="ia32" or target_arch=="x64"', { | 38 ['target_arch=="ia32" or target_arch=="x64"', { |
| 40 'copies': [ | 39 'copies': [ |
| 41 { | 40 { |
| 42 'destination': '>(tc_include_dir_glibc)/include/nacl', | 41 'destination': '>(tc_include_dir_glibc)/include/nacl', |
| 43 'files': [ | 42 'files': [ |
| 44 'src/trusted/weak_ref/call_on_main_thread.h', | |
| 45 'src/shared/ppapi_proxy/ppruntime.h', | 43 'src/shared/ppapi_proxy/ppruntime.h', |
| 46 ], | 44 ], |
| 47 }, | 45 }, |
| 48 ], | 46 ], |
| 49 }], | 47 }], |
| 50 ['target_arch=="ia32"', { | 48 ['target_arch=="ia32"', { |
| 51 'copies': [ | 49 'copies': [ |
| 52 # Here we copy linker scripts out of the Native Client repo.. | 50 # Here we copy linker scripts out of the Native Client repo.. |
| 53 # These are source, not build artifacts. | 51 # These are source, not build artifacts. |
| 54 { | 52 { |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 276 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
| 279 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', | 277 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', |
| 280 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 278 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
| 281 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 279 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
| 282 ], | 280 ], |
| 283 }, | 281 }, |
| 284 ], | 282 ], |
| 285 }], | 283 }], |
| 286 ], | 284 ], |
| 287 } | 285 } |
| OLD | NEW |