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

ppapi/native_client/native_client.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.
 
 {
   'includes': [
     '../../build/common_untrusted.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
@@ skipping 101 matching lines @@
             'build_glibc': 0,
             'build_newlib': 0,
             'build_irt': 1,
             'include_dirs': [
               'lib/gl/include',
               '..',
             ],
             'link_flags': [
               '-Wl,--start-group',
               '-lirt_browser',
+              '-lpnacl_irt_shim_for_irt',
               '-lppapi_proxy_nacl',
               '-lppapi_ipc_nacl',
               '-lppapi_shared_nacl',
               '-lgles2_implementation_nacl',
               '-lgles2_cmd_helper_nacl',
               '-lgles2_utils_nacl',
               '-lcommand_buffer_client_nacl',
               '-lcommand_buffer_common_nacl',
               '-ltracing_nacl',
               '-lgpu_ipc_nacl',
@@ skipping 33 matching lines @@
                   '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a',
                   '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a',
                   '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a',
                   '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a',
                   '>(tc_lib_dir_irt64)/libtracing_nacl.a',
                   '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a',
                   '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a',
                   '>(tc_lib_dir_irt64)/libipc_nacl.a',
                   '>(tc_lib_dir_irt64)/libbase_nacl.a',
                   '>(tc_lib_dir_irt64)/libirt_browser.a',
+                  '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a',
                   '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a',
                   '>(tc_lib_dir_irt64)/libsrpc.a',
                   '>(tc_lib_dir_irt64)/libplatform.a',
                   '>(tc_lib_dir_irt64)/libimc_syscalls.a',
                   '>(tc_lib_dir_irt64)/libgio.a',
                 ],
                 'extra_deps_newlib32': [
                   '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a',
                   '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a',
                   '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a',
                   '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a',
                   '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a',
                   '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a',
                   '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a',
                   '>(tc_lib_dir_irt32)/libtracing_nacl.a',
                   '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a',
                   '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a',
                   '>(tc_lib_dir_irt32)/libipc_nacl.a',
                   '>(tc_lib_dir_irt32)/libbase_nacl.a',
                   '>(tc_lib_dir_irt32)/libirt_browser.a',
+                  '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a',
                   '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a',
                   '>(tc_lib_dir_irt32)/libsrpc.a',
                   '>(tc_lib_dir_irt32)/libplatform.a',
                   '>(tc_lib_dir_irt32)/libimc_syscalls.a',
                   '>(tc_lib_dir_irt32)/libgio.a',
                 ],
               }],
               ['target_arch=="arm"', {
                 'extra_deps_arm': [
                   '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libtracing_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libipc_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libbase_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libirt_browser.a',
+                  '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a',
                   '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a',
                   '>(tc_lib_dir_irt_arm)/libsrpc.a',
                   '>(tc_lib_dir_irt_arm)/libplatform.a',
                   '>(tc_lib_dir_irt_arm)/libimc_syscalls.a',
                   '>(tc_lib_dir_irt_arm)/libgio.a',
                 ],
               }],
               ['target_arch=="mipsel"', {
                 'extra_deps_mips': [
                   '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libtracing_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libipc_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libbase_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libirt_browser.a',
+                  '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a',
                   '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a',
                   '>(tc_lib_dir_irt_mips)/libsrpc.a',
                   '>(tc_lib_dir_irt_mips)/libplatform.a',
                   '>(tc_lib_dir_irt_mips)/libimc_syscalls.a',
                   '>(tc_lib_dir_irt_mips)/libgio.a',
                 ],
               }],
             ],
           },
           'dependencies': [
+            'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_for_irt',
             '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
             '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
             '../ppapi_shared_nacl.gyp:ppapi_shared_nacl',
             '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
             '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
             '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
             '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
             '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
             '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
             '../../components/tracing_nacl.gyp:tracing_nacl',
             '../../ipc/ipc_nacl.gyp:ipc_nacl',
             '../../base/base_nacl.gyp:base_nacl',
             '../../media/media_nacl.gyp:shared_memory_support_nacl',
             '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
             '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
             '../../native_client/src/shared/platform/platform.gyp:platform_lib',
             '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
             '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
             '../../native_client/src/shared/gio/gio.gyp:gio_lib',
           ],
         },
       ],
     }],
   ],
 }