Roll NaCl toolchain change.

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

Index: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
index 9fadd74376789e4096bab5b24733d411c39b5c24..e8dc67d1e037a0272d249ae524622908184a59cc 100644
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
@@ -8,66 +8,19 @@
   'includes': [
     '../../../../../build/common_untrusted.gypi',
   ],
-  'variables': {
-    'pnacl_translator_dir%': "",
-    'pnacl_translator_stamp%': "pnacl_translator.json",
-  },
   'targets': [
   {
-    'target_name': 'untar_pnacl_translator',
-    'type': 'none',
-    'conditions': [
-      ['pnacl_translator_dir==""', {
-        'actions': [{
-          'action_name': 'Untar pnacl_translator',
-          'description': 'Untar pnacl_translator',
-          'inputs': [
-              '<(DEPTH)/native_client/build/package_version/package_version.py',
-              '<(DEPTH)/native_client/toolchain/.tars/<(TOOLCHAIN_OS)_x86/pnacl_translator.json',
-          ],
-          'outputs': ['<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator/<(pnacl_translator_stamp)'],
-          'action': [
-            'python',
-            '<(DEPTH)/native_client/build/package_version/package_version.py',
-            '--quiet',
-            '--packages', 'pnacl_translator',
-            '--tar-dir', '<(DEPTH)/native_client/toolchain/.tars',
-            '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)/sdk',
-            'extract',
-          ],
-        }],
-      }, {
-        'actions': [{
-          'action_name': 'Copy pnacl_translator',
-          'description': 'Copy pnacl_translator',
-          'inputs': [
-            '<(DEPTH)/native_client/build/copy_directory.py',
-            '<(pnacl_translator_dir)/<(pnacl_translator_stamp)',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator/<(pnacl_translator_stamp)'],
-          'action': [
-            'python',
-            '<(DEPTH)/native_client/build/copy_directory.py',
-            '--quiet',
-            '--stamp-arg', 'pnacl_translator_stamp',
-            '--stamp-file', '<(pnacl_translator_stamp)',
-            '<(pnacl_translator_dir)',
-            '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator',
-          ],
-        }],
-      }],
-    ],
-  },
-  {
     'target_name': 'pnacl_support_extension',
     'type': 'none',
+    'variables': {
+      'pnacl_translator_dir%': "<(DEPTH)/native_client/toolchain/<(TOOLCHAIN_OS)_x86/pnacl_translator",
+      'pnacl_translator_stamp%': "pnacl_translator.json",
+    },
     '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:browser',
           '../../../../../native_client/tools.gyp:prep_toolchain',
-          'untar_pnacl_translator',
         ],
         'sources': [
           'pnacl_component_crx_gen.py',
@@ -80,7 +33,7 @@
             'inputs': [
               'pnacl_component_crx_gen.py',
               # A stamp file representing the contents of pnacl_translator.
-              '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator/<(pnacl_translator_stamp)',
+              '<(pnacl_translator_dir)/<(pnacl_translator_stamp)',
               '<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json',
               '<(DEPTH)/native_client/toolchain_revisions/pnacl_newlib.json',
             ],
@@ -206,7 +159,7 @@
               '<@(lib_overrides)',
               '--target_arch=<(target_arch)',
               '--info_template_path=<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json',
-              '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator',
+              '--pnacl_translator_path=<(pnacl_translator_dir)',
               '--package_version_path=<(DEPTH)/native_client/build/package_version/package_version.py',
               '--pnacl_package_name=pnacl_newlib',
               # ABI Version Number.