Chromium Code Reviews| Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp |
| diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp |
| index 8312d23cfce2bee029ad4b5b8985b51e98cc1519..c126cc3178731d8abe9db39514d1e1f974019a4e 100644 |
| --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp |
| +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp |
| @@ -3,47 +3,42 @@ |
| # found in the LICENSE file. |
| { |
| - 'conditions': [ |
| - ['target_arch!="mipsel"', { |
| - 'includes': [ |
| - '../../../../../native_client/build/untrusted.gypi', |
| - ], |
| - 'targets': [ |
| - { |
| - 'target_name': 'pnacl_irt_shim', |
| - 'type': 'none', |
| - 'variables': { |
| - 'nlib_target': 'libpnacl_irt_shim.a', |
| - 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_target)', |
| - 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(nlib_target)', |
| - 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(nlib_target)', |
| - 'build_glibc': 0, |
| - 'build_newlib': 0, |
| - 'build_pnacl_newlib': 1, |
| - 'pnacl_native_biased': 1, |
| - 'enable_x86_32': 1, |
| - 'enable_x86_64': 1, |
| - 'enable_arm': 1, |
| - 'sources': [ |
| - 'pnacl_shim.c', |
| - 'shim_entry.c', |
| - 'shim_ppapi.c', |
| - ], |
| - 'include_dirs': [ |
| - '../../../..', |
| - ], |
| - 'extra_args': [ |
| - '--strip-debug', |
| - ], |
| - }, |
| - 'dependencies': [ |
| - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| - ], |
| - }, |
| + 'includes': [ |
| + '../../../../../native_client/build/untrusted.gypi', |
| + ], |
| + 'targets': [ |
| + { |
| + 'target_name': 'pnacl_irt_shim', |
| + 'type': 'none', |
| + 'variables': { |
| + 'nlib_target': 'libpnacl_irt_shim.a', |
| + 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_target)', |
| + 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(nlib_target)', |
| + 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(nlib_target)', |
| + 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(nlib_target)', |
| + 'build_glibc': 0, |
| + 'build_newlib': 0, |
| + 'build_pnacl_newlib': 1, |
| + 'pnacl_native_biased': 1, |
| + 'enable_x86_32': 1, |
| + 'enable_x86_64': 1, |
| + 'enable_arm': 1, |
| + '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
|
| + 'sources': [ |
| + 'pnacl_shim.c', |
| + 'shim_entry.c', |
| + 'shim_ppapi.c', |
| + ], |
| + 'include_dirs': [ |
| + '../../../..', |
| + ], |
| + 'extra_args': [ |
| + '--strip-debug', |
| + ], |
| + }, |
| + 'dependencies': [ |
| + '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| ], |
| }, |
| - { |
| - 'targets': [], |
| - }], |
| - ] |
| + ], |
| } |