Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: ppapi/ppapi_nacl_test_common.gypi

Issue 786273008: Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 'action_name': 'Generate PNACL NEWLIB nonsfi NMF', 214 'action_name': 'Generate PNACL NEWLIB nonsfi NMF',
215 'inputs': ['>(create_nonsfi_test_nmf)'], 215 'inputs': ['>(create_nonsfi_test_nmf)'],
216 'outputs': ['>(nmf_pnacl_newlib_nonsfi)'], 216 'outputs': ['>(nmf_pnacl_newlib_nonsfi)'],
217 'action': [ 217 'action': [
218 'python', 218 'python',
219 '>(create_nonsfi_test_nmf)', 219 '>(create_nonsfi_test_nmf)',
220 '>@(create_nmf_args_portable)', 220 '>@(create_nmf_args_portable)',
221 '--output=>(nmf_pnacl_newlib_nonsfi)', 221 '--output=>(nmf_pnacl_newlib_nonsfi)',
222 ], 222 ],
223 'target_conditions': [ 223 'target_conditions': [
224 ['enable_x86_32_nonsfi==1', { 224 ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="ia32"', {
225 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'], 225 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
226 'action': [ 226 'action': [
227 '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)', 227 '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
228 '--arch=x86-32', 228 '--arch=x86-32',
229 ] 229 ]
230 }], 230 }],
231 ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="x64"', {
232 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
233 'action': [
234 '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
235 '--arch=x86-64',
236 ]
237 }],
231 ['enable_arm_nonsfi==1', { 238 ['enable_arm_nonsfi==1', {
232 'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'], 239 'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'],
233 'action': [ 240 'action': [
234 '--program=>(out_pnacl_newlib_arm_nonsfi_nexe)', 241 '--program=>(out_pnacl_newlib_arm_nonsfi_nexe)',
235 '--arch=arm', 242 '--arch=arm',
236 ] 243 ]
237 }], 244 }],
238 ], 245 ],
239 }, 246 },
240 ], 247 ],
241 }], 248 }],
242 ], 249 ],
243 }], 250 }],
244 ], 251 ],
245 }, 252 },
246 } 253 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698