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

components/nacl.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'nacl/nacl_defines.gypi',
@@ skipping 68 matching lines @@
             '../ipc/ipc.gyp:ipc',
             '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome',
           ],
           'conditions': [
             ['disable_nacl_untrusted==0', {
               'dependencies': [
                 '../ppapi/native_client/native_client.gyp:nacl_irt',
-                '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
                 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp:pnacl_support_extension',
               ],
             }],
           ],
           'direct_dependent_settings': {
             'defines': [
               '<@(nacl_defines)',
             ],
           },
         },
@@ skipping 286 matching lines @@
         'nacl/common/nacl_types.h',
         'nacl/common/pnacl_types.cc',
         'nacl/common/pnacl_types.h',
       ],
       'include_dirs': [
         '..',
       ],
     },
   ]
 }