[MIPS] Use IRT shim instead of dummy IRT shim

ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.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.
 
 {
   # re: untrusted.gypi -- Though this doesn't really use build_nexe.py or
   # anything, it depends on untrusted nexes from the toolchain and for the shim.
   'includes': [
     '../../../../../build/common_untrusted.gypi',
   ],
   'targets': [
   {
     'target_name': 'pnacl_support_extension',
     'type': 'none',
     'conditions': [
       ['disable_nacl==0 and disable_pnacl==0 and disable_nacl_untrusted==0', {
         'dependencies': [
           '../../../../../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',
         ],
         # We could use 'copies', but we want to rename the files
         # in a white-listed way first.  Thus use a script.
         'actions': [
           {
             'action_name': 'generate_pnacl_support_extension',
             'inputs': [
               'pnacl_component_crx_gen.py',
@@ skipping 59 matching lines @@
                         },
                       }],
                       ['target_arch=="mipsel"', {
                         'outputs': [
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_pnacl_json',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_crtbegin_o',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_ld_nexe',
                           '<(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"', {
                         'outputs': [
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_pnacl_json',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_crtbegin_o',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_ld_nexe',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libcrt_platform_a',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libgcc_a',
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_libgcc_eh_a',
@@ skipping 43 matching lines @@
               '--tool_revisions_path=<(DEPTH)/native_client/TOOL_REVISIONS',
               # ABI Version Number.
               '1',
             ],
           },
         ],
       }],
     ],
   }],
 }