Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots.

ppapi/ppapi_nacl.gyp

Index: ppapi/ppapi_nacl.gyp
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index bbad95528af93616ddf6cd8ee08409b312f8256a..9fdabc3c60613819f78a10ae2ab5be538b706ea3 100644
--- a/ppapi/ppapi_nacl.gyp
+++ b/ppapi/ppapi_nacl.gyp
@@ -235,7 +235,7 @@
             },
           ],
         }],
-        ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="arm") and OS=="linux"', {
+        ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="x64" or target_arch=="arm") and OS=="linux"', {
           # In addition to above configuration, build x86-32 and arm nonsfi
           # .nexe files by translating from .pexe binary, for non-SFI mode PPAPI
           # testing.
@@ -244,7 +244,7 @@
             'nmf_nonsfi%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_nonsfi.nmf',
           },
           'conditions': [
-            ['target_arch=="ia32"', {
+            ['target_arch=="ia32" or target_arch=="x64"', {
               'variables': {
                 'enable_x86_32_nonsfi': 1,
               },
@@ -270,17 +270,35 @@
                 '--output=>(nmf_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)',
+                    # This should be used only for nacl_helper_nonsfi test.
+                    # In theory this should be x86-32. However, currently
+                    # fallback logic to x86-32-nonsfi is not implemented,
+                    # and, moreover, it would break the tests for current
+                    # nacl_helper in Non-SFI mode on x64 Chrome.
+                    # So, here we introduce the hack to use "x86-64" in order
+                    # to take the benefit to run nacl_helper_nonsfi tests on
+                    # x64 Chrome.
+                    # TODO(hidehiko): Remove this hack.
+                    '--arch=x86-64',
+                  ]
                 }],
                 ['enable_arm_nonsfi==1', {
+                  'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'],
                   'action': [
                     '--program=>(out_pnacl_newlib_arm_nonsfi_nexe)',
                     '--arch=arm',
-                  ],
+                  ]
                 }],
               ],
             },