[MIPS] Use IRT shim instead of dummy IRT shim

IRT shim is needed as it whitelists NaCl IRT interfaces exposed under
PNaCl.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=2275
TEST= Build Chromium for MIPS

Review URL: https://codereview.chromium.org/175533002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252847 0039d316-1c4b-4281-b951-d872f2087c98

components/nacl.gyp

@@ -90,11 +90,6 @@
                 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp:pnacl_support_extension',
               ],
             }],
-            ['target_arch=="mipsel"', {
-              'dependencies!': [
-                '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
-              ],
-            }],
           ],
           'direct_dependent_settings': {
             'defines': [

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

@@ -3,47 +3,42 @@
 # found in the LICENSE file.
 
 {
-  'conditions': [
-    ['target_arch!="mipsel"', {
-      'includes': [
-        '../../../../../native_client/build/untrusted.gypi',
-      ],
-      'targets': [
-        {
-          'target_name': 'pnacl_irt_shim',
-          'type': 'none',
-          'variables': {
-            'nlib_target': 'libpnacl_irt_shim.a',
-            'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_target)',
-            'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(nlib_target)',
-            'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(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,
-            'sources': [
-              'pnacl_shim.c',
-              'shim_entry.c',
-              'shim_ppapi.c',
-            ],
-            'include_dirs': [
-              '../../../..',
-            ],
-            'extra_args': [
-              '--strip-debug',
-            ],
-          },
-          'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-          ],
-        },
+  'includes': [
+    '../../../../../native_client/build/untrusted.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'pnacl_irt_shim',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libpnacl_irt_shim.a',
+        'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_target)',
+        'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(nlib_target)',
+        'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(nlib_target)',
+        'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(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': [
+          'pnacl_shim.c',
+          'shim_entry.c',
+          'shim_ppapi.c',
+        ],
+        'include_dirs': [
+          '../../../..',
+        ],
+        'extra_args': [
+          '--strip-debug',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ],
     },
-    {
-      'targets': [],
-    }],
-  ]
+  ],
 }

ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp

@@ -18,13 +18,6 @@
           '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
           '../../../../../native_client/tools.gyp:prep_toolchain',
         ],
-        'conditions': [
-          ['target_arch=="mipsel"', {
-            'dependencies!': [
-              '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
-            ],
-          }],
-        ],
         'sources': [
           'pnacl_component_crx_gen.py',
         ],
@@ -104,11 +97,17 @@
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libcrt_platform_a',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libgcc_a',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libgcc_eh_a',
-                          '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libpnacl_irt_shim_dummy_a',
+                          '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libpnacl_irt_shim_a',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_llc_nexe',
                         ],
+                        'inputs': [
+                          '>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim.a',
+                        ],
                         'variables': {
-                          'lib_overrides': [],
+                          'lib_overrides': [
+                            # Use the freshly generated shim.
+                            '--lib_override=mipsel,>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim.a',
+                          ],
                         },
                       }],
                       ['target_arch=="ia32"', {