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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/ppapi_nacl_test_common.gypi
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
index ea6132723cf5a8f6b8c16996be49cacd3b01b26b..531c4c1b952cca98f47e584021cc5506ca583c6a 100644
--- a/ppapi/ppapi_nacl_test_common.gypi
+++ b/ppapi/ppapi_nacl_test_common.gypi
@@ -221,13 +221,20 @@
'--output=>(nmf_pnacl_newlib_nonsfi)',
],
'target_conditions': [
- ['enable_x86_32_nonsfi==1', {
+ ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="ia32"', {
'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
'action': [
'--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
'--arch=x86-32',
]
}],
+ ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="x64"', {
+ 'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
+ 'action': [
+ '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
+ '--arch=x86-64',
+ ]
+ }],
['enable_arm_nonsfi==1', {
'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'],
'action': [

Powered by Google App Engine
This is Rietveld 408576698