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

ppapi/native_client/native_client.gyp

Index: ppapi/native_client/native_client.gyp
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index ee83999a444fcca64e226c903458f6009f4ba188..636d32d01fcc6f17de010156751dfdd27f7e9c84 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -108,6 +108,7 @@
             'link_flags': [
               '-Wl,--start-group',
               '-lirt_browser',
+              '-lpnacl_irt_shim_for_irt',
               '-lppapi_proxy_untrusted',
               '-lppapi_ipc_untrusted',
               '-lppapi_shared_untrusted',
@@ -161,6 +162,7 @@
                   '>(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',
@@ -181,6 +183,7 @@
                   '>(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',
@@ -203,6 +206,7 @@
                   '>(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',
@@ -213,6 +217,7 @@
             ],
           },
           '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',