| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 '-lppapi_cpp', | 103 '-lppapi_cpp', |
| 104 '-lppapi', | 104 '-lppapi', |
| 105 '-pthread', | 105 '-pthread', |
| 106 ], | 106 ], |
| 107 'extra_args': [ | 107 'extra_args': [ |
| 108 '--strip-all', | 108 '--strip-all', |
| 109 ], | 109 ], |
| 110 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', | 110 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', |
| 111 'create_nmf_args_portable%': [], | 111 'create_nmf_args_portable%': [], |
| 112 'create_nonsfi_test_nmf': '<(DEPTH)/ppapi/tests/create_nonsfi_test_nmf
.py', | 112 'create_nonsfi_test_nmf': '<(DEPTH)/ppapi/tests/create_nonsfi_test_nmf
.py', |
| 113 'create_nmf_args': [ |
| 114 '--no-default-libpath', |
| 115 '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', |
| 116 ], |
| 113 }, | 117 }, |
| 114 'target_conditions': [ | 118 'target_conditions': [ |
| 115 ['generate_nmf==1 and build_newlib==1', { | 119 ['generate_nmf==1 and build_newlib==1', { |
| 116 'actions': [ | 120 'actions': [ |
| 117 { | 121 { |
| 118 'action_name': 'Generate NEWLIB NMF', | 122 'action_name': 'Generate NEWLIB NMF', |
| 119 'inputs': ['>(create_nmf)'], | 123 'inputs': ['>(create_nmf)'], |
| 120 'outputs': ['>(nmf_newlib)'], | 124 'outputs': ['>(nmf_newlib)'], |
| 121 'action': [ | 125 'action': [ |
| 122 'python', | 126 'python', |
| 123 '>(create_nmf)', | 127 '>(create_nmf)', |
| 128 '>@(create_nmf_args)', |
| 124 '--output=>(nmf_newlib)', | 129 '--output=>(nmf_newlib)', |
| 125 '>@(create_nmf_args_portable)', | 130 '>@(create_nmf_args_portable)', |
| 126 ], | 131 ], |
| 127 'target_conditions': [ | 132 'target_conditions': [ |
| 128 ['enable_x86_64==1', { | 133 ['enable_x86_64==1', { |
| 129 'inputs': ['>(out_newlib64)'], | 134 'inputs': ['>(out_newlib64)'], |
| 130 'action': ['>(out_newlib64)'], | 135 'action': ['>(out_newlib64)'], |
| 131 }], | 136 }], |
| 132 ['enable_x86_32==1', { | 137 ['enable_x86_32==1', { |
| 133 'inputs': ['>(out_newlib32)'], | 138 'inputs': ['>(out_newlib32)'], |
| (...skipping 10 matching lines...) Expand all Loading... |
| 144 ], | 149 ], |
| 145 }, | 150 }, |
| 146 ], | 151 ], |
| 147 }], | 152 }], |
| 148 ['"<(target_arch)"!="arm" and "<(target_arch)"!="mipsel" and generate_
nmf==1 and disable_glibc==0 and build_glibc==1', { | 153 ['"<(target_arch)"!="arm" and "<(target_arch)"!="mipsel" and generate_
nmf==1 and disable_glibc==0 and build_glibc==1', { |
| 149 'variables': { | 154 'variables': { |
| 150 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which | 155 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which |
| 151 # doesn't work on Windows. | 156 # doesn't work on Windows. |
| 152 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', | 157 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', |
| 153 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', | 158 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', |
| 154 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', | |
| 155 }, | 159 }, |
| 156 'actions': [ | 160 'actions': [ |
| 157 { | 161 { |
| 158 'action_name': 'Generate GLIBC NMF and copy libs', | 162 'action_name': 'Generate GLIBC NMF and copy libs', |
| 159 'inputs': ['>(create_nmf)'], | 163 'inputs': ['>(create_nmf)'], |
| 160 # NOTE: There is no explicit dependency for the lib32 | 164 # NOTE: There is no explicit dependency for the lib32 |
| 161 # and lib64 directories created in the PRODUCT_DIR. | 165 # and lib64 directories created in the PRODUCT_DIR. |
| 162 # They are created as a side-effect of NMF creation. | 166 # They are created as a side-effect of NMF creation. |
| 163 'outputs': ['>(nmf_glibc)'], | 167 'outputs': ['>(nmf_glibc)'], |
| 164 'action': [ | 168 'action': [ |
| 165 'python', | 169 'python', |
| 166 '>@(_inputs)', | 170 '>@(_inputs)', |
| 167 '--objdump=>(nacl_objdump)', | 171 '>@(create_nmf_args)', |
| 168 '--output=>(nmf_glibc)', | 172 '--output=>(nmf_glibc)', |
| 169 '--path-prefix=>(nexe_target)_libs', | 173 '--path-prefix=>(nexe_target)_libs', |
| 170 '--stage-dependencies=<(nacl_glibc_out_dir)', | 174 '--stage-dependencies=<(nacl_glibc_out_dir)', |
| 171 '>@(create_nmf_args_portable)', | 175 '>@(create_nmf_args_portable)', |
| 172 ], | 176 ], |
| 173 'target_conditions': [ | 177 'target_conditions': [ |
| 174 ['enable_x86_64==1', { | 178 ['enable_x86_64==1', { |
| 175 'inputs': ['>(out_glibc64)'], | 179 'inputs': ['>(out_glibc64)'], |
| 176 'action': [ | 180 'action': [ |
| 177 '--library-path=>(libdir_glibc64)', | 181 '--library-path=>(libdir_glibc64)', |
| (...skipping 16 matching lines...) Expand all Loading... |
| 194 'actions': [ | 198 'actions': [ |
| 195 { | 199 { |
| 196 'action_name': 'Generate PNACL NEWLIB NMF', | 200 'action_name': 'Generate PNACL NEWLIB NMF', |
| 197 # NOTE: create_nmf must be first, it is the script python | 201 # NOTE: create_nmf must be first, it is the script python |
| 198 # executes below. | 202 # executes below. |
| 199 'inputs': ['>(create_nmf)', '>(out_pnacl_newlib)'], | 203 'inputs': ['>(create_nmf)', '>(out_pnacl_newlib)'], |
| 200 'outputs': ['>(nmf_pnacl_newlib)'], | 204 'outputs': ['>(nmf_pnacl_newlib)'], |
| 201 'action': [ | 205 'action': [ |
| 202 'python', | 206 'python', |
| 203 '>(create_nmf)', | 207 '>(create_nmf)', |
| 208 '>@(create_nmf_args)', |
| 204 '--output=>(nmf_pnacl_newlib)', | 209 '--output=>(nmf_pnacl_newlib)', |
| 205 '>(out_pnacl_newlib)', | 210 '>(out_pnacl_newlib)', |
| 206 '>@(create_nmf_args_portable)', | 211 '>@(create_nmf_args_portable)', |
| 207 ], | 212 ], |
| 208 }, | 213 }, |
| 209 ], | 214 ], |
| 210 }], | 215 }], |
| 211 ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0 and (
enable_x86_32_nonsfi==1 or enable_arm_nonsfi==1)', { | 216 ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0 and (
enable_x86_32_nonsfi==1 or enable_arm_nonsfi==1)', { |
| 212 'actions': [ | 217 'actions': [ |
| 213 { | 218 { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 237 }], | 242 }], |
| 238 ], | 243 ], |
| 239 }, | 244 }, |
| 240 ], | 245 ], |
| 241 }], | 246 }], |
| 242 ], | 247 ], |
| 243 }], | 248 }], |
| 244 ], | 249 ], |
| 245 }, | 250 }, |
| 246 } | 251 } |
| OLD | NEW |