Incorporate shimming into the irt

src/untrusted/irt/irt.gyp

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 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.gypi',
   ],
   'variables': {
     'irt_sources': [
 # irt_support_sources
@@ skipping 33 matching lines @@
     ],
     'irt_browser': [
       'irt_interfaces_ppapi.c',
       'irt_entry_ppapi.c',
       'irt_ppapi.c',
       'irt_manifest.c',
     ],
   },
   'targets': [
     {
+      'target_name': 'irt_core_common',

[jvoung (off chromium), 2012/08/27 21:53:58]

"irt_core_nexe" doesn't use a shim.  How does "irt_core_common" relate to
"irt_core_nexe"?

[Nick Bray (chromium), 2012/08/27 23:00:02]

Instead of having the core irt depend on this. The gyp changes should land on
the chrome side. And the ppapi irt should depend on the shim target.

+      'type': 'none',
+      'direct_dependent_settings': {
+         'sources': [ '<@(irt_sources)', ],
+      },
+      'conditions': [
+        ['target_arch=="x64"', {
+            'dependencies': [ 'shim_generator.gyp:shim_generated_source', ],
+            'sources': [ '<(SHARED_INTERMEDIATE_DIR)/pnacl_shim.c', ],
+          }, {  # else
+            'sources': [ 'shim_dummy.c', ],
+        }],
+      ],
+    },
+    {
       'target_name': 'irt_core_nexe',
       'type': 'none',
       'variables': {
         'nexe_target': 'irt_core',
         'build_glibc': 0,
         'build_newlib': 1,
       },
-      'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'],
+      'sources': ['<@(irt_nonbrowser)'],
       'link_flags': [
         '-lsrpc',
         '-limc_syscalls',
         '-lplatform',
         '-lgio',
         '-lm',
       ],
       'conditions': [
         # See comment in native_client/src/untrusted/irt/nacl.scons
         # regarding -Ttext-segment. Also see
         # http://code.google.com/p/nativeclient/issues/detail?id=2691.
         ['target_arch!="arm"',
          {
            'link_flags': [
              '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
              '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
            ]
          }, { # target_arch == "arm"
-           'sources': ['<@(irt_sources)',
-                       'aeabi_read_tp.S'],
+           'sources': ['aeabi_read_tp.S'],
            'cflags': ['--pnacl-allow-translate',
                       '-arch', 'arm'],
            'asflags': ['-arch', 'arm'],
            'link_flags': [
              '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
              '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
              '--pnacl-allow-native',
              '-arch', 'arm',
              '-Wt,-mtls-use-call',
              # TODO(olonho): rethink
              '-L<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
            ],
          },
        ],
       ],
       'dependencies': [
+        'irt_core_common',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ],
     },
     {
       'target_name': 'irt_browser_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libirt_browser.a',
         'build_glibc': 0,
         'build_newlib': 1,
       },
-      'sources': ['<@(irt_sources)', '<@(irt_browser)'],
+      'sources': ['<@(irt_browser)'],
       'conditions': [
         ['target_arch == "x64" or target_arch == "ia32"', {
           'link_flags': [
            '-r',
            '-nostartfiles',
           ],
         }],
       ],
       'dependencies': [
+        'irt_core_common',
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
       ],
     },
   ],
 }