Add PNaCl PPAPI browser tests via pre-translation.

ppapi/ppapi_untrusted.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file defines untrusted (NaCl) targets.  All targets in this
 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
 # requiring NaCl sources for building.
 
 {
   'includes': [
@@ skipping 85 matching lines @@
           '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi.so',
         ],
         'extra_deps_glibc32': [
           '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_cpp.so',
           '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi.so',
         ],
         'extra_deps_arm': [
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi.a',
         ],
+        'extra_deps_pnacl': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib/libppapi.a',
+        ],
         'sources': [
           '<@(test_common_source_files)',
           '<@(test_nacl_source_files)',
         ],
         'extra_args': [
           '--strip-all',
         ],
       },
       'conditions': [
         ['target_arch!="arm"', {
+          # This is user code (vs IRT code), so tls accesses do not
+          # need to be indirect through a function call.
+          # For PNaCl, the -mtls-use-call flag is localized to the
+          # IRT's translation command, so it is unnecessary to
+          # counteract that flag here.
           'variables': {
-            'compile_flags': [
+            'gcc_compile_flags': [
               '-mno-tls-use-call',
             ],
           },
         }],
         ['target_arch!="arm" and disable_glibc==0', {
           'variables': {
             'build_glibc': 1,
             # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
             # doesn't work on Windows.
             'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
@@ skipping 18 matching lines @@
               '--library-path=>(libdir_glibc32)',
               '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
               '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
               '--output=>(nmf_glibc)',
               '--stage-dependencies=<(PRODUCT_DIR)',
             ],
             'msvs_cygwin_shell': 1,
           },
         ],
         }],
+        # Test PNaCl pre-translated code (pre-translated to save bot time).
+        # We only care about testing that code generation is correct,
+        # and in-browser translation is tested elsewhere.
+        # NOTE: native_client/build/untrusted.gypi dictates that
+        # PNaCl only generate x86-32 and x86-64 on x86 platforms,
+        # or ARM on ARM platforms, not all versions always.
+        # The same goes for the PNaCl shims. So, we have two variations here.
+        ['disable_pnacl==0 and target_arch!="arm"', {
+          'variables': {
+            'build_pnacl_newlib': 1,
+            'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf',
+          },
+          # Shim is a dependency for the nexe because we pre-translate.
+          'dependencies': [
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
+          ],
+         'actions': [
+            {
+              'action_name': 'Generate PNACL NEWLIB NMF',
+              'inputs': ['>(out_pnacl_newlib_x86_32_nexe)',
+                         '>(out_pnacl_newlib_x86_64_nexe)'],
+              'outputs': ['>(nmf_pnacl)'],
+              'action': [
+                'python',
+                '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
+                '>@(_inputs)',
+                '--output=>(nmf_pnacl)',
+              ],
+            },
+          ],
+        }],
+        ['disable_pnacl==0 and target_arch=="arm"', {
+          'variables': {
+            'build_pnacl_newlib': 1,
+            'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf',
+          },
+          # Shim is a dependency for the nexe because we pre-translate.
+          'dependencies': [
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
+          ],
+          'actions': [
+            {
+              'action_name': 'Generate PNACL NEWLIB NMF',
+              'inputs': ['>(out_pnacl_newlib_arm_nexe)'],
+              'outputs': ['>(nmf_pnacl)'],
+              'action': [
+                'python',
+                '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
+                '>@(_inputs)',
+                '--output=>(nmf_pnacl)',
+              ],
+            },
+          ],
+        }],
       ],
     },
   ],
 }