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 90 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_untrusted',
               '-lppapi_ipc_untrusted',
               '-lppapi_shared_untrusted',
               '-lgles2_implementation_untrusted',
               '-lgles2_cmd_helper_untrusted',
               '-lgles2_utils_untrusted',
               '-lcommand_buffer_client_untrusted',
               '-lcommand_buffer_common_untrusted',
               '-ltracing_untrusted',
               '-lgpu_ipc_untrusted',
@@ skipping 33 matching lines @@
                   '>(tc_lib_dir_irt64)/libgles2_implementation_untrusted.a',
                   '>(tc_lib_dir_irt64)/libcommand_buffer_client_untrusted.a',
                   '>(tc_lib_dir_irt64)/libcommand_buffer_common_untrusted.a',
                   '>(tc_lib_dir_irt64)/libgpu_ipc_untrusted.a',
                   '>(tc_lib_dir_irt64)/libtracing_untrusted.a',
                   '>(tc_lib_dir_irt64)/libgles2_cmd_helper_untrusted.a',
                   '>(tc_lib_dir_irt64)/libgles2_utils_untrusted.a',
                   '>(tc_lib_dir_irt64)/libipc_untrusted.a',
                   '>(tc_lib_dir_irt64)/libbase_untrusted.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_untrusted.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_untrusted.a',
                   '>(tc_lib_dir_irt32)/libppapi_ipc_untrusted.a',
                   '>(tc_lib_dir_irt32)/libppapi_shared_untrusted.a',
                   '>(tc_lib_dir_irt32)/libgles2_implementation_untrusted.a',
                   '>(tc_lib_dir_irt32)/libcommand_buffer_client_untrusted.a',
                   '>(tc_lib_dir_irt32)/libcommand_buffer_common_untrusted.a',
                   '>(tc_lib_dir_irt32)/libgpu_ipc_untrusted.a',
                   '>(tc_lib_dir_irt32)/libtracing_untrusted.a',
                   '>(tc_lib_dir_irt32)/libgles2_cmd_helper_untrusted.a',
                   '>(tc_lib_dir_irt32)/libgles2_utils_untrusted.a',
                   '>(tc_lib_dir_irt32)/libipc_untrusted.a',
                   '>(tc_lib_dir_irt32)/libbase_untrusted.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_untrusted.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_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libppapi_ipc_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libppapi_shared_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libgles2_implementation_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libgpu_ipc_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libtracing_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libgles2_utils_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libipc_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libbase_untrusted.a',
                   '>(tc_lib_dir_irt_arm)/libirt_browser.a',
+                  '>(tc_lib_dir_irt_arm/libpnacl_irt_shim_for_irt.a',

[Mark Seaborn, 2014/02/14 23:45:36]

Missing ")" here

[jvoung (off chromium), 2014/02/25 22:44:11]

Done.

                   '>(tc_lib_dir_irt_arm)/libshared_memory_support_untrusted.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',
                 ],
               }],
             ],
           },
           'dependencies': [
+            'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_for_irt',
             '../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
             '../ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted',
             '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
             '../../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
             '../../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted',
             '../../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted',
             '../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
             '../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted',
             '../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
             '../../components/tracing_untrusted.gyp:tracing_untrusted',
@@ skipping 129 matching lines @@
                   ],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }