Chromium no longer needs to extract toolchains during runhooks.

build/download_nacl_toolchains.py

 #!/usr/bin/env python
 # 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.
 
 """Shim to run nacl toolchain download script only if there is a nacl dir."""
 
 import os
+import shutil
 import sys
 
 
 def Main(args):
   # Exit early if disable_nacl=1.
   if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
     return 0
   script_dir = os.path.dirname(os.path.abspath(__file__))
   src_dir = os.path.dirname(script_dir)
   nacl_dir = os.path.join(src_dir, 'native_client')
@@ skipping 24 matching lines @@
     else:
       args.extend(['--exclude', 'pnacl_newlib'])
 
   # Only download the ARM gcc toolchain if we are building for ARM
   # TODO(olonho): we need to invent more reliable way to get build
   # configuration info, to know if we're building for ARM.
   if 'target_arch=arm' not in os.environ.get('GYP_DEFINES', ''):
       args.extend(['--exclude', 'nacl_arm_newlib'])
 
   args.append('sync')
-  args.append('--extract')
   package_version.main(args)
+
+  # Because we are no longer extracting the toolchain, it is best to delete
+  # the old extracted ones so that no stale toolchains are left behind. This
+  # also would catch any stale code that happens to work because it is using
+  # an old extracted toolchain that was left behind.
+  toolchain_dir = os.path.join(nacl_dir, 'toolchain')
+  for toolchain_item in os.listdir(toolchain_dir):
+    toolchain_path = os.path.join(toolchain_dir, toolchain_item)
+    if os.path.isdir(toolchain_path) and not toolchain_item.startswith('.'):
+      shutil.rmtree(toolchain_path)
+
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))