[polymer] Merge of master into polymer10-migration

third_party/vinn/bin/update_v8

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Updates the 64 bit d8 binary for the current OS to match the v8 version used
 in the current version of the specified Chromium channel. If no channel is
 specified, we default to the 'stable' channel.
 
 This script assumes that git is installed and the computer meets all
@@ skipping 17 matching lines @@
 OMAHAPROXY_VERSION_MAP_URL = 'https://omahaproxy.appspot.com/all.json'
 
 V8_PATH = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), os.path.pardir, 'third_party',
     'v8')
 V8_DST_PATH = os.path.join(V8_PATH, '{os}', '{arch}')
 V8_README_PATH = os.path.join(V8_PATH, 'README.chromium')
 
 V8_CHECKOUT_BINARY_PATH = os.path.join(
     '{v8_root}', 'v8', 'out', 'Release', 'd8')
-V8_GENERATE_GYP_CMD = (sys.executable + ' ' + os.path.join('build', 'gyp_v8') +
+V8_GENERATE_GYP_CMD = (sys.executable + ' ' +
+                       os.path.join('gypfiles', 'gyp_v8') +
                        ' -Dtarget_arch={arch}')
-V8_COMPILE_CMD = 'ninja -C {0} d8'.format(os.path.join('out', 'Release'))
+V8_COMPILE_CMD = 'ninja -j 100 -C {0} d8'.format(os.path.join('out', 'Release'))
 V8_STRIP_CMD = 'strip -x {0}'.format(os.path.join('out', 'Release', 'd8'))
 
 VALID_CHANNEL_LIST = ['stable', 'canary', 'beta', 'dev']
 # Dict from the acceptable return values for Python's platform.system() to the
 # corresponding Chromium OS name.
 PYTHON_SYSTEM_TO_CHROME_OS = {
   'Linux': 'linux',
   'Windows': 'win',
   'Darwin': 'mac'
 }
@@ skipping 54 matching lines @@
   subprocess.check_call(command, shell=True, stderr=sys.stderr,
                         stdout=sys.stdout)
 
 def UpdateV8Binary(v8_version, target_os, target_arch):
   """Updates the catapult V8 binary for the specified OS to be the specified V8
   version."""
   # Clone v8, checkout the version that corresponds to our target OS and target
   # channel, and build the d8 binary.
   with TempDir() as v8_checkout_path:
     with ChangeDirectory(v8_checkout_path):
-      os.environ['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0'
+      if 'DEPOT_TOOLS_WIN_TOOLCHAIN' not in os.environ:
+        # If the user doesn't specify that they're using the Googler Windows
+        # build toolchain, assume that they're not.
+        os.environ['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0'
+
       _RunCommand('fetch v8')
       with ChangeDirectory('v8'):
         _RunCommand('git checkout {0}'.format(v8_version))
         _RunCommand('gclient sync')
         if not 'GYP_DEFINES' in os.environ:
           os.environ['GYP_DEFINES'] = ''
         os.environ['GYP_DEFINES'] += ' v8_use_external_startup_data=0'
         os.environ['GYP_GENERATORS'] = 'ninja'
         ninja_arch = PYTHON_MACHINE_TO_NINJA_ARCH[target_arch]
         _RunCommand(
@@ skipping 50 matching lines @@
     print "creating {0}".format(self.path)
     return self.path
 
   def __exit__(self, etype, value, traceback):
     shutil.rmtree(self.path, ignore_errors=True)
     if os.path.isdir(self.path):
       print '%s still exists. You may want to delete it' % self.path
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))