| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 'includes': [ | 6 'includes': [ |
| 7 '../build/common_untrusted.gypi', | 7 '../build/common_untrusted.gypi', |
| 8 ], | 8 ], |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 # We need to override the variables in untrusted.gypi outside of a | 10 # We need to override the variables in untrusted.gypi outside of a |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 'actions': [ | 156 'actions': [ |
| 157 { | 157 { |
| 158 'action_name': 'Generate GLIBC NMF and copy libs', | 158 'action_name': 'Generate GLIBC NMF and copy libs', |
| 159 'inputs': ['>(create_nmf)'], | 159 'inputs': ['>(create_nmf)'], |
| 160 # NOTE: There is no explicit dependency for the lib32 | 160 # NOTE: There is no explicit dependency for the lib32 |
| 161 # and lib64 directories created in the PRODUCT_DIR. | 161 # and lib64 directories created in the PRODUCT_DIR. |
| 162 # They are created as a side-effect of NMF creation. | 162 # They are created as a side-effect of NMF creation. |
| 163 'outputs': ['>(nmf_glibc)'], | 163 'outputs': ['>(nmf_glibc)'], |
| 164 'action': [ | 164 'action': [ |
| 165 'python', | 165 'python', |
| 166 '>(create_nmf)', | 166 '>@(_inputs)', |
| 167 '--objdump=>(nacl_objdump)', | 167 '--objdump=>(nacl_objdump)', |
| 168 '--output=>(nmf_glibc)', | 168 '--output=>(nmf_glibc)', |
| 169 '--path-prefix=>(nexe_target)_libs', | 169 '--path-prefix=>(nexe_target)_libs', |
| 170 '--stage-dependencies=<(nacl_glibc_out_dir)', | 170 '--stage-dependencies=<(nacl_glibc_out_dir)', |
| 171 '>@(create_nmf_args_portable)', | 171 '>@(create_nmf_args_portable)', |
| 172 ], | 172 ], |
| 173 'target_conditions': [ | 173 'target_conditions': [ |
| 174 ['enable_x86_64==1', { | 174 ['enable_x86_64==1', { |
| 175 'inputs': ['>(out_glibc64)'], | 175 'inputs': ['>(out_glibc64)'], |
| 176 'action': [ | 176 'action': [ |
| 177 '>(out_glibc64)', | |
| 178 '--library-path=>(libdir_glibc64)', | 177 '--library-path=>(libdir_glibc64)', |
| 179 '--library-path=>(tc_lib_dir_glibc64)', | 178 '--library-path=>(tc_lib_dir_glibc64)', |
| 180 ], | 179 ], |
| 181 }], | 180 }], |
| 182 ['enable_x86_32==1', { | 181 ['enable_x86_32==1', { |
| 183 'inputs': ['>(out_glibc32)'], | 182 'inputs': ['>(out_glibc32)'], |
| 184 'action': [ | 183 'action': [ |
| 185 '>(out_glibc32)', | |
| 186 '--library-path=>(libdir_glibc32)', | 184 '--library-path=>(libdir_glibc32)', |
| 187 '--library-path=>(tc_lib_dir_glibc32)', | 185 '--library-path=>(tc_lib_dir_glibc32)', |
| 188 ], | 186 ], |
| 189 }], | 187 }], |
| 190 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. | 188 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. |
| 191 ], | 189 ], |
| 192 }, | 190 }, |
| 193 ], | 191 ], |
| 194 }], | 192 }], |
| 195 ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0', { | 193 ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0', { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 }], | 237 }], |
| 240 ], | 238 ], |
| 241 }, | 239 }, |
| 242 ], | 240 ], |
| 243 }], | 241 }], |
| 244 ], | 242 ], |
| 245 }], | 243 }], |
| 246 ], | 244 ], |
| 247 }, | 245 }, |
| 248 } | 246 } |
| OLD | NEW |