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 # re: untrusted.gypi -- Though this doesn't really use build_nexe.py or | 6 # re: untrusted.gypi -- Though this doesn't really use build_nexe.py or |
| 7 # anything, it depends on untrusted nexes from the toolchain and for the shim. | 7 # anything, it depends on untrusted nexes from the toolchain and for the shim. |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../../../../../build/common_untrusted.gypi', | 9 '../../../../../build/common_untrusted.gypi', |
| 10 ], | 10 ], |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 'inputs': [ | 82 'inputs': [ |
| 83 '>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_sh im.a', | 83 '>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_sh im.a', |
| 84 ], | 84 ], |
| 85 'variables': { | 85 'variables': { |
| 86 'lib_overrides': [ | 86 'lib_overrides': [ |
| 87 # Use the freshly generated shim. | 87 # Use the freshly generated shim. |
| 88 '--lib_override=arm,>(tc_lib_dir_pnacl_translate)/li b-arm/libpnacl_irt_shim.a', | 88 '--lib_override=arm,>(tc_lib_dir_pnacl_translate)/li b-arm/libpnacl_irt_shim.a', |
| 89 ], | 89 ], |
| 90 }, | 90 }, |
| 91 }], | 91 }], |
| 92 ['target_arch=="mipsel"', { | |
| 93 'outputs': [ | |
| 94 '<(PRODUCT_DIR)/pnacl/pnacl_public_pnacl_json', | |
| 95 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_crtbegin_o', | |
| 96 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_crtbeginS_o', | |
|
jvoung (off chromium)
2014/02/06 00:39:56
We no longer build a crtbeginS
petarj
2014/02/20 00:23:18
Done.
| |
| 97 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_ld_nexe', | |
| 98 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_libcrt_platfor m_a', | |
| 99 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_libgcc_a', | |
| 100 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_libgcc_eh_a', | |
| 101 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_libpnacl_irt_s him_a', | |
| 102 '<(PRODUCT_DIR)/pnacl/pnacl_public_mips_llc_nexe', | |
| 103 ], | |
| 104 'inputs': [ | |
| 105 '>(tc_lib_dir_pnacl_translate)/lib-mips/libpnacl_irt_s him.a', | |
| 106 ], | |
| 107 'variables': { | |
| 108 'lib_overrides': [ | |
| 109 # Use the freshly generated shim. | |
| 110 '--lib_override=mipsel,>(tc_lib_dir_pnacl_translate) /lib-mips/libpnacl_irt_shim.a', | |
| 111 ], | |
| 112 }, | |
| 113 }], | |
| 92 ['target_arch=="ia32"', { | 114 ['target_arch=="ia32"', { |
| 93 'outputs': [ | 115 'outputs': [ |
| 94 '<(PRODUCT_DIR)/pnacl/pnacl_public_pnacl_json', | 116 '<(PRODUCT_DIR)/pnacl/pnacl_public_pnacl_json', |
| 95 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_crtbegin_o', | 117 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_crtbegin_o', |
| 96 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_ld_nexe', | 118 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_ld_nexe', |
| 97 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libcrt_platf orm_a', | 119 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libcrt_platf orm_a', |
| 98 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libgcc_a', | 120 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libgcc_a', |
| 99 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libgcc_eh_a' , | 121 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libgcc_eh_a' , |
| 100 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libpnacl_irt _shim_a', | 122 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libpnacl_irt _shim_a', |
| 101 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_pnacl_llc_ne xe', | 123 '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_pnacl_llc_ne xe', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 '--tool_revisions_path=<(DEPTH)/native_client/TOOL_REVISIONS', | 165 '--tool_revisions_path=<(DEPTH)/native_client/TOOL_REVISIONS', |
| 144 # ABI Version Number. | 166 # ABI Version Number. |
| 145 '1', | 167 '1', |
| 146 ], | 168 ], |
| 147 }, | 169 }, |
| 148 ], | 170 ], |
| 149 }], | 171 }], |
| 150 ], | 172 ], |
| 151 }], | 173 }], |
| 152 } | 174 } |
| OLD | NEW |