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

ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp

Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
index 7f2b677fcb9852f54b4d81ad892280c1acf33fd8..d1ef7746d62d347f1178a16be103ee308ae8b0b4 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
@@ -8,7 +8,8 @@
   ],
   'targets': [
     {
-      'target_name': 'pnacl_irt_shim',
+      # The full library, which PNaCl uses for offline .pexe -> .nexe.
+      'target_name': 'pnacl_irt_shim_aot',
       'type': 'none',
       'variables': {
         'nlib_target': 'libpnacl_irt_shim.a',
@@ -28,10 +29,72 @@
           'pnacl_shim.c',
           'shim_entry.c',
           'shim_ppapi.c',
+          '../../../../proxy/irt_shim_ppapi.c',
         ],
         'extra_args': [
           '--strip-debug',
         ],
+        # Indicate that shim should not depend on unstable IRT hook interface.
+        'compile_flags': [
+          '-DPNACL_SHIM_AOT=1',

[Mark Seaborn, 2014/02/26 22:11:03]

I don't see a corresponding -DPNACL_SHIM_AOT=0, which you should really have if
you're using "#if PNACL_SHIM_AOT" (which is preferable to #ifdef).

But if there's no good place for -DPNACL_SHIM_AOT=0, maybe use
"-DPNACL_SHIM_AOT" and #ifdef instead?

[jvoung (off chromium), 2014/02/27 01:39:55]

The irt_shim_ppapi.h does check PNACL_SHIM_AOT, but that's #include'ed by
irt_ppapi.c in ppapi/proxy, as well as by the files here... so rather than put
compile flags in both gyp files I think it'll be better to just use
-DPNACL_SHIM_AOT and #ifdef.

Also moved irt_shim_ppapi to this directory so that the (direct) references to
PNACL_SHIM_AOT are all in the same directory.

 

+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+      ],
+    },
+    # Smaller shim library for PNaCl in-browser translation.
+    # Uses an unstable IRT hook interface to get the shim from the IRT itself.
+    # If we ever change that hook interface or change the in-IRT shim's ABI,
+    # we would need to clear the translation cache to match the new IRT.
+    {
+      'target_name': 'pnacl_irt_shim_browser',
+      'type': 'none',
+      'variables': {
+        # Same name as pnacl_irt_shim_aot, so that we don't need to change
+        # the linker commandlines, but output to the "for_browser" directory,
+        # and have the pnacl_support_extension copy from that directory.
+        'nlib_target': 'libpnacl_irt_shim.a',
+        'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/for_browser/>(nlib_target)',
+        'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for_browser/>(nlib_target)',
+        'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for_browser/>(nlib_target)',
+        'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/for_browser/>(nlib_target)',
+        'build_glibc': 0,
+        'build_newlib': 0,
+        'build_pnacl_newlib': 1,
+        'pnacl_native_biased': 1,
+        'enable_x86_32': 1,
+        'enable_x86_64': 1,
+        'enable_arm': 1,
+        'enable_mips': 1,
+        'sources': [
+          'shim_entry.c',
+          'shim_ppapi.c',
+        ],
+        'extra_args': [
+          '--strip-debug',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+      ],
+    },
+    {
+      # Second half of shim library for PNaCl in-browser translation.
+      # This half goes into the IRT and is returned by the unstable
+      # IRT hook interface.
+      'target_name': 'pnacl_irt_shim_for_irt',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libpnacl_irt_shim_for_irt.a',
+        'build_glibc': 0,
+        'build_newlib': 0,
+        # Unlike the above, build this the way the IRT is built so that the
+        # output library directories match the IRT linking search paths.
+        'build_irt': 1,
+        'sources': [
+          'pnacl_shim.c',
+        ],

[Mark Seaborn, 2014/02/26 22:11:03]

This version doesn't have "--strip-debug".  Is there a reason for having it (and
then not having it)?

Is there a reason for using type=none?

[jvoung (off chromium), 2014/02/27 01:39:55]

This will get linked into the IRT, which may get stripped by a later step anyway
(but there might be a full debug version of that stashed somewhere), so it
seemed better to let the IRT build take care of stripping as needed.


The old version has strip-debug because it was a library that would get packaged
w/ the pnacl-translator and I wanted to keep the whole set of translator files
small.
I had thought this is the usual thing for cross compiled NaCl libraries. I'm not
entirely sure what the default would be.

       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',