Chromium Code Reviews| 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 'conditions': [ | 6 'includes': [ |
| 7 ['target_arch!="mipsel"', { | 7 '../../../../../native_client/build/untrusted.gypi', |
| 8 'includes': [ | 8 ], |
| 9 '../../../../../native_client/build/untrusted.gypi', | 9 'targets': [ |
| 10 ], | 10 { |
| 11 'targets': [ | 11 'target_name': 'pnacl_irt_shim', |
| 12 { | 12 'type': 'none', |
| 13 'target_name': 'pnacl_irt_shim', | 13 'variables': { |
| 14 'type': 'none', | 14 'nlib_target': 'libpnacl_irt_shim.a', |
| 15 'variables': { | 15 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_ta rget)', |
| 16 'nlib_target': 'libpnacl_irt_shim.a', | 16 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(n lib_target)', |
| 17 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nli b_target)', | 17 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(n lib_target)', |
| 18 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32 />(nlib_target)', | 18 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(nli b_target)', |
| 19 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64 />(nlib_target)', | 19 'build_glibc': 0, |
| 20 'build_glibc': 0, | 20 'build_newlib': 0, |
| 21 'build_newlib': 0, | 21 'build_pnacl_newlib': 1, |
| 22 'build_pnacl_newlib': 1, | 22 'pnacl_native_biased': 1, |
| 23 'pnacl_native_biased': 1, | 23 'enable_x86_32': 1, |
| 24 'enable_x86_32': 1, | 24 'enable_x86_64': 1, |
| 25 'enable_x86_64': 1, | 25 'enable_arm': 1, |
| 26 'enable_arm': 1, | 26 'enable_mips': 1, |
|
jvoung (off chromium)
2014/02/21 19:46:48
This might need some rejiggering in nacl's build/u
jvoung (off chromium)
2014/02/21 21:02:32
Okay thanks, please leave a comment by the untrust
| |
| 27 'sources': [ | 27 'sources': [ |
| 28 'pnacl_shim.c', | 28 'pnacl_shim.c', |
| 29 'shim_entry.c', | 29 'shim_entry.c', |
| 30 'shim_ppapi.c', | 30 'shim_ppapi.c', |
| 31 ], | 31 ], |
| 32 'include_dirs': [ | 32 'include_dirs': [ |
| 33 '../../../..', | 33 '../../../..', |
| 34 ], | 34 ], |
| 35 'extra_args': [ | 35 'extra_args': [ |
| 36 '--strip-debug', | 36 '--strip-debug', |
| 37 ], | 37 ], |
| 38 }, | 38 }, |
| 39 'dependencies': [ | 39 'dependencies': [ |
| 40 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 40 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 41 ], | |
| 42 }, | |
| 43 ], | 41 ], |
| 44 }, | 42 }, |
| 45 { | 43 ], |
| 46 'targets': [], | |
| 47 }], | |
| 48 ] | |
| 49 } | 44 } |
| OLD | NEW |