libv8 6.7.288.46.1 → 7.3.492.27.0beta1

data/vendor/depot_tools/dart_format.py

@@ -14,7 +14,7 @@ import os
 import subprocess
 import sys
 
-import gclient_utils
+import gclient_paths
 
 class NotFoundError(Exception):
   """A file could not be found."""
@@ -26,7 +26,7 @@ class NotFoundError(Exception):
 
 def FindDartFmtToolInChromiumTree():
   """Return a path to the dartfmt executable, or die trying."""
-  primary_solution_path = gclient_utils.GetPrimarySolutionPath()
+  primary_solution_path = gclient_paths.GetPrimarySolutionPath()
   if not primary_solution_path:
     raise NotFoundError(
         'Could not find checkout in any parent of the current path.')

data/vendor/depot_tools/detect_host_arch.py

@@ -5,6 +5,8 @@
 
 """Outputs host CPU architecture in format recognized by gyp."""
 
+from __future__ import print_function
+
 import platform
 import re
 import sys
@@ -12,7 +14,8 @@ import sys
 
 def HostArch():
   """Returns the host architecture with a predictable string."""
-  host_arch = platform.machine()
+  host_arch = platform.machine().lower()
+  host_processor = platform.processor().lower()
 
   # Convert machine type to format recognized by gyp.
   if re.match(r'i.86', host_arch) or host_arch == 'i86pc':
@@ -23,9 +26,11 @@ def HostArch():
     host_arch = 'arm'
   elif host_arch.startswith('aarch64'):
     host_arch = 'arm64'
+  elif host_arch.startswith('mips64'):
+    host_arch = 'mips64'
   elif host_arch.startswith('mips'):
     host_arch = 'mips'
-  elif host_arch.startswith('ppc'):
+  elif host_arch.startswith('ppc') or host_processor == 'powerpc':
     host_arch = 'ppc'
   elif host_arch.startswith('s390'):
     host_arch = 's390'
@@ -48,4 +53,4 @@ def DoMain(_):
   return HostArch()
 
 if __name__ == '__main__':
-  print DoMain([])
+  print(DoMain([]))

data/vendor/depot_tools/download_from_google_storage.py

@@ -5,11 +5,17 @@
 
 """Download files from Google Storage based on SHA1 sums."""
 
+from __future__ import print_function
 
 import hashlib
 import optparse
 import os
-import Queue
+
+try:
+  import Queue as queue
+except ImportError:  # For Py3 compatibility
+  import queue
+
 import re
 import shutil
 import stat
@@ -110,13 +116,13 @@ class Gsutil(object):
         timeout=self.timeout)
 
     # Parse output.
-    status_code_match = re.search('status=([0-9]+)', err)
+    status_code_match = re.search(b'status=([0-9]+)', err)
     if status_code_match:
       return (int(status_code_match.group(1)), out, err)
-    if ('You are attempting to access protected data with '
-          'no configured credentials.' in err):
+    if (b'You are attempting to access protected data with '
+        b'no configured credentials.' in err):
       return (403, out, err)
-    if 'matched no objects' in err:
+    if b'matched no objects' in err:
       return (404, out, err)
     return (code, out, err)
 
@@ -164,15 +170,15 @@ def enumerate_input(input_filename, directory, recursive, ignore_errors, output,
     if not os.path.exists(input_filename):
       if not ignore_errors:
         raise FileNotFoundError('%s not found.' % input_filename)
-      print >> sys.stderr, '%s not found.' % input_filename
+      print('%s not found.' % input_filename, file=sys.stderr)
     with open(input_filename, 'rb') as f:
-      sha1_match = re.match('^([A-Za-z0-9]{40})$', f.read(1024).rstrip())
+      sha1_match = re.match(b'^([A-Za-z0-9]{40})$', f.read(1024).rstrip())
       if sha1_match:
         yield (sha1_match.groups(1)[0], output)
         return
     if not ignore_errors:
       raise InvalidFileError('No sha1 sum found in %s.' % input_filename)
-    print >> sys.stderr, 'No sha1 sum found in %s.' % input_filename
+    print('No sha1 sum found in %s.' % input_filename, file=sys.stderr)
     return
 
   if not directory:
@@ -198,20 +204,20 @@ def enumerate_input(input_filename, directory, recursive, ignore_errors, output,
                    'the path of %s' % full_path)
             if not ignore_errors:
               raise InvalidFileError(err)
-            print >> sys.stderr, err
+            print(err, file=sys.stderr)
             continue
           current_platform = PLATFORM_MAPPING[sys.platform]
           if current_platform != target_platform:
             continue
 
         with open(full_path, 'rb') as f:
-          sha1_match = re.match('^([A-Za-z0-9]{40})$', f.read(1024).rstrip())
+          sha1_match = re.match(b'^([A-Za-z0-9]{40})$', f.read(1024).rstrip())
         if sha1_match:
           yield (sha1_match.groups(1)[0], full_path.replace('.sha1', ''))
         else:
           if not ignore_errors:
             raise InvalidFileError('No sha1 sum found in %s.' % filename)
-          print >> sys.stderr, 'No sha1 sum found in %s.' % filename
+          print('No sha1 sum found in %s.' % filename, file=sys.stderr)
 
 
 def _validate_tar_file(tar, prefix):
@@ -246,7 +252,7 @@ def _downloader_worker_thread(thread_num, q, force, base_url,
         if get_sha1(output_filename) == input_sha1_sum:
           continue
     # Check if file exists.
-    file_url = '%s/%s' % (base_url, input_sha1_sum)
+    file_url = '%s/%s' % (base_url, input_sha1_sum.decode())
     (code, _, err) = gsutil.check_call('ls', file_url)
     if code != 0:
       if code == 404:
@@ -256,10 +262,10 @@ def _downloader_worker_thread(thread_num, q, force, base_url,
             file_url, output_filename)))
       else:
         # Other error, probably auth related (bad ~/.boto, etc).
-        out_q.put('%d> Failed to fetch file %s for %s, skipping. [Err: %s]' % (
-            thread_num, file_url, output_filename, err))
-        ret_codes.put((1, 'Failed to fetch file %s for %s. [Err: %s]' % (
-            file_url, output_filename, err)))
+        out_q.put('%d> Failed to fetch file %s for %s, skipping. [Err: %s]' %
+                  (thread_num, file_url, output_filename, err.decode()))
+        ret_codes.put((1, 'Failed to fetch file %s for %s. [Err: %s]' %
+                       (file_url, output_filename, err.decode())))
       continue
     # Fetch the file.
     out_q.put('%d> Downloading %s...' % (thread_num, output_filename))
@@ -272,8 +278,8 @@ def _downloader_worker_thread(thread_num, q, force, base_url,
             thread_num, output_filename))
     code, _, err = gsutil.check_call('cp', file_url, output_filename)
     if code != 0:
-      out_q.put('%d> %s' % (thread_num, err))
-      ret_codes.put((code, err))
+      out_q.put('%d> %s' % (thread_num, err.decode()))
+      ret_codes.put((code, err.decode()))
       continue
 
     remote_sha1 = get_sha1(output_filename)
@@ -328,8 +334,8 @@ def _downloader_worker_thread(thread_num, q, force, base_url,
       # "x-goog-meta-executable".
       code, out, _ = gsutil.check_call('stat', file_url)
       if code != 0:
-        out_q.put('%d> %s' % (thread_num, err))
-        ret_codes.put((code, err))
+        out_q.put('%d> %s' % (thread_num, err.decode()))
+        ret_codes.put((code, err.decode()))
       elif re.search(r'executable:\s*1', out):
         st = os.stat(output_filename)
         os.chmod(output_filename, st.st_mode | stat.S_IEXEC)
@@ -348,7 +354,7 @@ class PrinterThread(threading.Thread):
       if line is None:
         break
       self.did_print_anything = True
-      print line
+      print(line)
 
 
 def _data_exists(input_sha1_sum, output_filename, extract):
@@ -405,9 +411,9 @@ def download_from_google_storage(
   # Start up all the worker threads.
   all_threads = []
   download_start = time.time()
-  stdout_queue = Queue.Queue()
-  work_queue = Queue.Queue()
-  ret_codes = Queue.Queue()
+  stdout_queue = queue.Queue()
+  work_queue = queue.Queue()
+  ret_codes = queue.Queue()
   ret_codes.put((0, None))
   for thread_num in range(num_threads):
     t = threading.Thread(
@@ -438,12 +444,12 @@ def download_from_google_storage(
   for ret_code, message in ret_codes.queue:
     max_ret_code = max(ret_code, max_ret_code)
     if message:
-      print >> sys.stderr, message
+      print(message, file=sys.stderr)
 
   # Only print summary if any work was done.
   if printer_thread.did_print_anything:
-    print 'Downloading %d files took %1f second(s)' % (
-        len(input_data), time.time() - download_start)
+    print('Downloading %d files took %1f second(s)' %
+          (len(input_data), time.time() - download_start))
   return max_ret_code
 
 
@@ -530,14 +536,16 @@ def main(args):
     if (set(('http_proxy', 'https_proxy')).intersection(
         env.lower() for env in os.environ) and
         'NO_AUTH_BOTO_CONFIG' not in os.environ):
-      print >> sys.stderr, ('NOTICE: You have PROXY values set in your '
-                            'environment, but gsutil in depot_tools does not '
-                            '(yet) obey them.')
-      print >> sys.stderr, ('Also, --no_auth prevents the normal BOTO_CONFIG '
-                            'environment variable from being used.')
-      print >> sys.stderr, ('To use a proxy in this situation, please supply '
-                            'those settings in a .boto file pointed to by '
-                            'the NO_AUTH_BOTO_CONFIG environment var.')
+      print('NOTICE: You have PROXY values set in your environment, but gsutil'
+            'in depot_tools does not (yet) obey them.',
+            file=sys.stderr)
+      print('Also, --no_auth prevents the normal BOTO_CONFIG environment'
+            'variable from being used.',
+            file=sys.stderr)
+      print('To use a proxy in this situation, please supply those settings'
+            'in a .boto file pointed to by the NO_AUTH_BOTO_CONFIG environment'
+            'variable.',
+            file=sys.stderr)
     options.boto = os.environ.get('NO_AUTH_BOTO_CONFIG', os.devnull)
 
   # Make sure gsutil exists where we expect it to.
@@ -550,10 +558,10 @@ def main(args):
 
   # Passing in -g/--config will run our copy of GSUtil, then quit.
   if options.config:
-    print '===Note from depot_tools==='
-    print 'If you do not have a project ID, enter "0" when asked for one.'
-    print '===End note from depot_tools==='
-    print
+    print('===Note from depot_tools===')
+    print('If you do not have a project ID, enter "0" when asked for one.')
+    print('===End note from depot_tools===')
+    print()
     gsutil.check_call('version')
     return gsutil.call('config')
 

data/vendor/depot_tools/fetch.py

@@ -18,6 +18,8 @@ Optional arguments may be passed on the command line in key-value pairs.
 These parameters will be passed through to the config's main method.
 """
 
+from __future__ import print_function
+
 import json
 import optparse
 import os
@@ -62,13 +64,22 @@ class Checkout(object):
     pass
 
   def run(self, cmd, return_stdout=False, **kwargs):
-    print 'Running: %s' % (' '.join(pipes.quote(x) for x in cmd))
+    print('Running: %s' % (' '.join(pipes.quote(x) for x in cmd)))
     if self.options.dry_run:
       return ''
     if return_stdout:
       return subprocess.check_output(cmd, **kwargs)
     else:
-      subprocess.check_call(cmd, **kwargs)
+      try:
+        subprocess.check_call(cmd, **kwargs)
+      except subprocess.CalledProcessError as e:
+        # If the subprocess failed, it likely emitted its own distress message
+        # already - don't scroll that message off the screen with a stack trace
+        # from this program as well. Emit a terse message and bail out here;
+        # otherwise a later step will try doing more work and may hide the
+        # subprocess message.
+        print('Subprocess failed with return code %d.' % e.returncode)
+        sys.exit(e.returncode)
       return ''
 
 
@@ -94,7 +105,7 @@ class GclientCheckout(Checkout):
 class GitCheckout(Checkout):
 
   def run_git(self, *cmd, **kwargs):
-    print 'Running: git %s' % (' '.join(pipes.quote(x) for x in cmd))
+    print('Running: git %s' % (' '.join(pipes.quote(x) for x in cmd)))
     if self.options.dry_run:
       return ''
     return git_common.run(*cmd, **kwargs)
@@ -108,15 +119,16 @@ class GclientGitCheckout(GclientCheckout, GitCheckout):
 
   def _format_spec(self):
     def _format_literal(lit):
-      if isinstance(lit, basestring):
+      if isinstance(lit, str) or (sys.version_info.major == 2 and
+                                  isinstance(lit, unicode)):
         return '"%s"' % lit
       if isinstance(lit, list):
         return '[%s]' % ', '.join(_format_literal(i) for i in lit)
       return '%r' % lit
     soln_strings = []
     for soln in self.spec['solutions']:
-      soln_string= '\n'.join('    "%s": %s,' % (key, _format_literal(value))
-                             for key, value in soln.iteritems())
+      soln_string = '\n'.join('    "%s": %s,' % (key, _format_literal(value))
+                              for key, value in soln.items())
       soln_strings.append('  {\n%s\n  },' % soln_string)
     gclient_spec = 'solutions = [\n%s\n]\n' % '\n'.join(soln_strings)
     extra_keys = ['target_os', 'target_os_only', 'cache_dir']
@@ -139,7 +151,7 @@ class GclientGitCheckout(GclientCheckout, GitCheckout):
     # Configure git.
     wd = os.path.join(self.base, self.root)
     if self.options.dry_run:
-      print 'cd %s' % wd
+      print('cd %s' % wd)
     self.run_git(
         'submodule', 'foreach',
         'git config -f $toplevel/.git/config submodule.$name.ignore all',
@@ -172,9 +184,9 @@ def CheckoutFactory(type_name, options, spec, root):
 def usage(msg=None):
   """Print help and exit."""
   if msg:
-    print 'Error:', msg
+    print('Error:', msg)
 
-  print textwrap.dedent("""\
+  print(textwrap.dedent("""\
     usage: %s [options] <config> [--property=value [--property2=value2 ...]]
 
     This script can be used to download the Chromium sources. See
@@ -188,13 +200,13 @@ def usage(msg=None):
        -n, --dry-run      Don't run commands, only print them.
        --no-history       Perform shallow clones, don't fetch the full git history.
 
-    Valid fetch configs:""") % os.path.basename(sys.argv[0])
+    Valid fetch configs:""") % os.path.basename(sys.argv[0]))
 
   configs_dir = os.path.join(SCRIPT_PATH, 'fetch_configs')
   configs = [f[:-3] for f in os.listdir(configs_dir) if f.endswith('.py')]
   configs.sort()
   for fname in configs:
-    print '  ' + fname
+    print('  ' + fname)
 
   sys.exit(bool(msg))
 
@@ -251,7 +263,7 @@ def run_config_fetch(config, props, aliased=False):
   config_path = os.path.abspath(
       os.path.join(SCRIPT_PATH, 'fetch_configs', config))
   if not os.path.exists(config_path + '.py'):
-    print "Could not find a config for %s" % config
+    print("Could not find a config for %s" % config)
     sys.exit(1)
 
   cmd = [sys.executable, config_path + '.py', 'fetch'] + props
@@ -285,12 +297,12 @@ def run(options, spec, root):
   except KeyError:
     return 1
   if not options.force and checkout.exists():
-    print 'Your current directory appears to already contain, or be part of, '
-    print 'a checkout. "fetch" is used only to get new checkouts. Use '
-    print '"gclient sync" to update existing checkouts.'
-    print
-    print 'Fetch also does not yet deal with partial checkouts, so if fetch'
-    print 'failed, delete the checkout and start over (crbug.com/230691).'
+    print('Your current directory appears to already contain, or be part of, ')
+    print('a checkout. "fetch" is used only to get new checkouts. Use ')
+    print('"gclient sync" to update existing checkouts.')
+    print()
+    print('Fetch also does not yet deal with partial checkouts, so if fetch')
+    print('failed, delete the checkout and start over (crbug.com/230691).')
     return 1
   return checkout.init()
 

data/vendor/depot_tools/fetch_configs/android_internal.py

@@ -0,0 +1,34 @@
+# Copyright (c) 2013 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.
+
+import sys
+
+import config_util  # pylint: disable=import-error
+
+
+# This class doesn't need an __init__ method, so we disable the warning
+# pylint: disable=no-init
+class AndroidInternal(config_util.Config):
+  """Basic Config alias for AndroidInternal -> Chromium."""
+
+  @staticmethod
+  def fetch_spec(props):
+    return {
+      'alias': {
+        'config': 'chromium',
+        'props': ['--target_os=android', '--internal=True', '--flash=False'],
+      },
+    }
+
+  @staticmethod
+  def expected_root(_props):
+    return ''
+
+
+def main(argv=None):
+  return AndroidInternal().handle_args(argv)
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))

data/vendor/depot_tools/fetch_configs/chromium.py

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import ast
 import sys
 
 import config_util  # pylint: disable=import-error
@@ -19,9 +20,24 @@ class Chromium(config_util.Config):
                  'url'    : url,
                  'managed'   : False,
                  'custom_deps': {},
+                 'custom_vars': {},
     }
     if props.get('webkit_revision', '') == 'ToT':
-      solution['custom_vars'] = {'webkit_revision': ''}
+      solution['custom_vars']['webkit_revision'] = ''
+    if ast.literal_eval(props.get('internal', 'False')):
+      solution['custom_vars']['checkout_src_internal'] = True
+
+      # TODO(jbudorick): Remove this once crbug.com/803846 and
+      # crbug.com/856278 are complete.
+      solution['custom_vars']['checkout_mobile_internal'] = True
+
+      if not ast.literal_eval(props.get('flash', 'False')):
+        solution['custom_deps'].update({
+            'src/third_party/adobe/flash/binaries/ppapi/linux': None,
+            'src/third_party/adobe/flash/binaries/ppapi/linux_x64': None,
+            'src/third_party/adobe/flash/symbols/ppapi/linux': None,
+            'src/third_party/adobe/flash/symbols/ppapi/linux_x64': None,
+        })
     spec = {
       'solutions': [solution],
     }
@@ -29,6 +45,7 @@ class Chromium(config_util.Config):
       spec['target_os'] = props['target_os'].split(',')
     if props.get('target_os_only'):
       spec['target_os_only'] = props['target_os_only']
+
     return {
       'type': 'gclient_git',
       'gclient_git_spec': spec,