| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 'newlib_tls_flags=': [], | 67 'newlib_tls_flags=': [], |
| 68 # TODO(bradnelson): Remove this compile flag once new nacl_rev is | 68 # TODO(bradnelson): Remove this compile flag once new nacl_rev is |
| 69 # above 9362. | 69 # above 9362. |
| 70 'compile_flags': [ | 70 'compile_flags': [ |
| 71 '-DGL_GLEXT_PROTOTYPES', | 71 '-DGL_GLEXT_PROTOTYPES', |
| 72 ], | 72 ], |
| 73 # Speed up pnacl linking by not generating debug info for tests. | 73 # Speed up pnacl linking by not generating debug info for tests. |
| 74 # We compile with --strip-all under extra_args so debug info is | 74 # We compile with --strip-all under extra_args so debug info is |
| 75 # discarded anyway. Remove this and the --strip-all flag if | 75 # discarded anyway. Remove this and the --strip-all flag if |
| 76 # debug info is really needed. | 76 # debug info is really needed. |
| 77 'compile_flags!': [ | 77 'compile_flags!': [ |
| 78 '-g', | 78 '-g', |
| 79 ], | 79 ], |
| 80 'defines': [ | 80 'defines': [ |
| 81 'GL_GLEXT_PROTOTYPES', | 81 'GL_GLEXT_PROTOTYPES', |
| 82 ], | 82 ], |
| 83 'nexe_target': 'ppapi_nacl_tests', | 83 'nexe_target': 'ppapi_nacl_tests', |
| 84 'build_newlib': 1, | 84 'build_newlib': 1, |
| 85 'include_dirs': [ | 85 'include_dirs': [ |
| 86 'lib/gl/include', | 86 'lib/gl/include', |
| 87 '..', | 87 '..', |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 '>(tc_lib_dir_pnacl_newlib)/libppapi.a', | 128 '>(tc_lib_dir_pnacl_newlib)/libppapi.a', |
| 129 ], | 129 ], |
| 130 'sources': [ | 130 'sources': [ |
| 131 '<@(test_common_source_files)', | 131 '<@(test_common_source_files)', |
| 132 '<@(test_nacl_source_files)', | 132 '<@(test_nacl_source_files)', |
| 133 ], | 133 ], |
| 134 'extra_args': [ | 134 'extra_args': [ |
| 135 '--strip-all', | 135 '--strip-all', |
| 136 ], | 136 ], |
| 137 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', | 137 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', |
| 138 'create_nonsfi_test_nmf': 'tests/create_nonsfi_test_nmf.py', |
| 138 }, | 139 }, |
| 139 'conditions': [ | 140 'conditions': [ |
| 140 ['target_arch!="arm" and target_arch!="mipsel" and disable_glibc==0', { | 141 ['target_arch!="arm" and target_arch!="mipsel" and disable_glibc==0', { |
| 141 'variables': { | 142 'variables': { |
| 142 'build_glibc': 1, | 143 'build_glibc': 1, |
| 143 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which | 144 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which |
| 144 # doesn't work on Windows. | 145 # doesn't work on Windows. |
| 145 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', | 146 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', |
| 146 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', | 147 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', |
| 147 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', | 148 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 '--output=>(nmf_pnacl)', | 206 '--output=>(nmf_pnacl)', |
| 206 ], | 207 ], |
| 207 }, | 208 }, |
| 208 ], | 209 ], |
| 209 }], | 210 }], |
| 210 ['disable_pnacl==0 and target_arch=="ia32" and OS=="linux"', { | 211 ['disable_pnacl==0 and target_arch=="ia32" and OS=="linux"', { |
| 211 # In addition to above configuration, build x86-32-nonsfi .nexe file | 212 # In addition to above configuration, build x86-32-nonsfi .nexe file |
| 212 # by translating from .pexe binary, for non-SFI mode PPAPI testing. | 213 # by translating from .pexe binary, for non-SFI mode PPAPI testing. |
| 213 'variables': { | 214 'variables': { |
| 214 'enable_x86_32_nonsfi': 1, | 215 'enable_x86_32_nonsfi': 1, |
| 216 'nmf_nonsfi%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_nonsfi.nmf', |
| 215 }, | 217 }, |
| 218 'actions': [ |
| 219 { |
| 220 'action_name': 'Generate PNACL NEWLIB NONSFI NMF', |
| 221 'inputs': ['>(create_nonsfi_test_nmf)'], |
| 222 'outputs': ['>(nmf_nonsfi)'], |
| 223 'action': [ |
| 224 'python', |
| 225 '>(create_nonsfi_test_nmf)', |
| 226 '--output=>(nmf_nonsfi)', |
| 227 '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)', |
| 228 ], |
| 229 }, |
| 230 ], |
| 216 }], | 231 }], |
| 217 ['disable_pnacl==0 and target_arch=="arm"', { | 232 ['disable_pnacl==0 and target_arch=="arm"', { |
| 218 'variables': { | 233 'variables': { |
| 219 'build_pnacl_newlib': 1, | 234 'build_pnacl_newlib': 1, |
| 220 'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf', | 235 'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf', |
| 221 }, | 236 }, |
| 222 # Shim is a dependency for the nexe because we pre-translate. | 237 # Shim is a dependency for the nexe because we pre-translate. |
| 223 'dependencies': [ | 238 'dependencies': [ |
| 224 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt
_shim.gyp:shim_aot', | 239 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt
_shim.gyp:shim_aot', |
| 225 ], | 240 ], |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 '>@(_inputs)', | 272 '>@(_inputs)', |
| 258 '--output=>(nmf_pnacl)', | 273 '--output=>(nmf_pnacl)', |
| 259 ], | 274 ], |
| 260 }, | 275 }, |
| 261 ], | 276 ], |
| 262 }], | 277 }], |
| 263 ], | 278 ], |
| 264 }, | 279 }, |
| 265 ], | 280 ], |
| 266 } | 281 } |
| OLD | NEW |