Increase flexibility for NaCl toolchain download script.

Passing arguments in from the DEPS file makes it easier to configure the
download. The main intent of this change is to make it easier to extract
the NaCl toolchain immedately after downloading it in the Mojo repo.
Currently Chromium does not need to extract the toolchain immedately, and
this would require ~920MB of disk space, so this refactoring makes
extraction possible but optional. Eventually Chromium will extract the
toolchain immedately, but this will require a deeper rework of the GYP
build.

BUG=https://code.google.com/p/chromium/issues/detail?id=401761

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

Cr-Commit-Position: refs/heads/master@{#309963}

1 files changed, 2 insertions, 14 deletions

diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py
index 7402689..b99b940 100755
--- a/build/download_nacl_toolchains.py
+++ b/build/download_nacl_toolchains.py
@@ -42,28 +42,16 @@ def Main(args):
     if use_pnacl:
       print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n'
     else:
-      args.extend(['--exclude', 'pnacl_newlib'])
+      args = ['--exclude', 'pnacl_newlib'] + args
 
   # 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 = ['--exclude', 'nacl_arm_newlib'] + args
 
-  args.extend(['--mode', 'nacl_core_sdk'])
-  args.append('sync')
   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