Split the PNaCl IRT shim into 3 pieces, and include one piece into IRT.

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 167 matching lines @@
         # 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',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_aot',
           ],
          'actions': [
             {
               'action_name': 'Generate PNACL NEWLIB NMF',
               # NOTE: create_nmf must be first, it is the script python executes
               # below.
               'inputs': [
                 '>(create_nmf)',
                 '>(out_pnacl_newlib_x86_32_nexe)',
                 '>(out_pnacl_newlib_x86_64_nexe)'
               ],
               'outputs': ['>(nmf_pnacl)'],
               'action': [
                 'python',
                 '>@(_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',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_aot',
           ],
           'actions': [
             {
               'action_name': 'Generate PNACL NEWLIB NMF',
               # NOTE: create_nmf must be first, it is the script python executes
               # below.
               'inputs': ['>(create_nmf)', '>(out_pnacl_newlib_arm_nexe)'],
               'outputs': ['>(nmf_pnacl)'],
               'action': [
                 'python',
                 '>@(_inputs)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
       ],
     },
   ],
 }