| 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 # 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 'extra_deps_arm': [ | 73 'extra_deps_arm': [ |
| 74 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_cpp.a', | 74 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_cpp.a', |
| 75 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi.a', | 75 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi.a', |
| 76 ], | 76 ], |
| 77 'sources': [ | 77 'sources': [ |
| 78 '<@(test_common_source_files)', | 78 '<@(test_common_source_files)', |
| 79 '<@(test_nacl_source_files)', | 79 '<@(test_nacl_source_files)', |
| 80 ], | 80 ], |
| 81 }, | 81 }, |
| 82 'conditions': [ | 82 'conditions': [ |
| 83 ['target_arch!="arm"', { | 83 ['target_arch!="arm" and disable_glibc==0', { |
| 84 'variables': { | 84 'variables': { |
| 85 'build_glibc': 1, | 85 'build_glibc': 1, |
| 86 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which | 86 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which |
| 87 # doesn't work on Windows. | 87 # doesn't work on Windows. |
| 88 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', | 88 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', |
| 89 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', | 89 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', |
| 90 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', | 90 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', |
| 91 'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf', | 91 'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf', |
| 92 }, | 92 }, |
| 93 'actions': [ | 93 'actions': [ |
| (...skipping 15 matching lines...) Expand all Loading... |
| 109 '--stage-dependencies=<(PRODUCT_DIR)', | 109 '--stage-dependencies=<(PRODUCT_DIR)', |
| 110 '--toolchain=glibc', | 110 '--toolchain=glibc', |
| 111 ], | 111 ], |
| 112 }, | 112 }, |
| 113 ], | 113 ], |
| 114 }], | 114 }], |
| 115 ], | 115 ], |
| 116 }, | 116 }, |
| 117 ], | 117 ], |
| 118 } | 118 } |
| OLD | NEW |