Roll NaCl toolchain change.

This CL causes gclient runhooks to unpack the NaCl toolchain to
//native_client/toolchain.  It also causes GYP to use the toolchain from that
location rather than unpacking it into the output directory during the build.

This CL adds a landmine to reclaim ~1 GB of disk space.  Landmines are normally
used for correctness issues, in this case it is being used because an additional
1 GB of disk usage could cause random bots to fail.

BUG=456902

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

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

1 files changed, 3 insertions, 7 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 1711242..d0102c7 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -170,7 +170,7 @@ def BuildStepDownloadToolchains(toolchains):
   if 'bionic' in toolchains:
     build_platform = '%s_x86' % getos.GetPlatform()
     args.extend(['--append', os.path.join(build_platform, 'nacl_arm_bionic')])
-  args.append('sync')
+  args.extend(['sync', '--extract'])
   buildbot_common.Run(args, cwd=NACL_DIR)
 
 
@@ -343,6 +343,8 @@ def MakeNinjaRelPath(path):
   return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), path)
 
 
+# TODO(ncbray): stop building and copying libraries into the SDK that are
+# already provided by the toolchain.
 TOOLCHAIN_LIBS = {
   'bionic' : [
     'libminidump_generator.a',
@@ -352,8 +354,6 @@ TOOLCHAIN_LIBS = {
     'libppapi.a',
   ],
   'newlib' : [
-    'crti.o',
-    'crtn.o',
     'libminidump_generator.a',
     'libnacl.a',
     'libnacl_dyncode.a',
@@ -464,10 +464,6 @@ def GypNinjaInstall(pepperdir, toolchains):
         bionic_dir = GetOutputToolchainLib(pepperdir, 'bionic', xarch)
         InstallFiles(src_dir, bionic_dir, TOOLCHAIN_LIBS['bionic'])
 
-      if tc != 'pnacl':
-        src_dir = GetGypToolchainLib(tc, xarch)
-        InstallFiles(src_dir, dst_dir, ['crt1.o'])
-
 
 def GypNinjaBuild_NaCl(rel_out_dir):
   # TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only