libv8 5.2.361.43.1 → 5.3.332.38.0beta2

data/vendor/depot_tools/recipe_modules/cipd/resources/bootstrap.py

@@ -0,0 +1,218 @@
+# 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.
+
+import argparse
+import errno
+import hashlib
+import json
+import os
+import sys
+import tempfile
+import time
+import traceback
+import urllib
+import urllib2
+
+
+# Default package repository URL.
+CIPD_BACKEND_URL = 'https://chrome-infra-packages.appspot.com'
+
+# ./cipd resolve \
+#     infra/tools/cipd/ \
+#     -version=git_revision:768586a9aa72fe6a41a8a0205ed56ceb1495625c
+CLIENT_VERSIONS = {
+  'linux-386': '3f5d6d3906c3b2c6a057d1ab1634ac06aa418708',
+  'linux-amd64': '1ea0b6b254ad3f546c826dd3e437798ace2c2480',
+  'mac-amd64': 'c111be343c692e5285113a6b1c999887adbb268e',
+  'windows-386': 'dc3d1bd5b4b93945640bac4bb047c333a8fa12fd',
+  'windows-amd64': 'bccdb9a605037e3dd2a8a64e79e08f691a6f159d',
+}
+
+
+class CipdBootstrapError(Exception):
+  """Raised by install_cipd_client on fatal error."""
+
+def install_cipd_client(path, package, version):
+  """Installs CIPD client to <path>/cipd.
+
+  Args:
+    path: root directory to install CIPD client into.
+    package: cipd client package name, e.g. infra/tools/cipd/linux-amd64.
+    version: version of the package to install.
+
+  Returns:
+    Absolute path to CIPD executable.
+  """
+  print 'Ensuring CIPD client is up-to-date'
+  version_file = os.path.join(path, 'VERSION')
+  bin_file = os.path.join(path, 'cipd')
+
+  # Resolve version to concrete instance ID, e.g "live" -> "abcdef0123....".
+  instance_id = call_cipd_api(
+      'repo/v1/instance/resolve',
+      {'package_name': package, 'version': version})['instance_id']
+  print 'CIPD client %s => %s' % (version, instance_id)
+
+  # Already installed?
+  installed_instance_id = (read_file(version_file) or '').strip()
+  if installed_instance_id == instance_id and os.path.exists(bin_file):
+    return bin_file, instance_id
+
+  # Resolve instance ID to an URL to fetch client binary from.
+  client_info = call_cipd_api(
+      'repo/v1/client',
+      {'package_name': package, 'instance_id': instance_id})
+  print 'CIPD client binary info:\n%s' % dump_json(client_info)
+
+  # Fetch the client. It is ~10 MB, so don't bother and fetch it into memory.
+  status, raw_client_bin = fetch_url(client_info['client_binary']['fetch_url'])
+  if status != 200:
+    print 'Failed to fetch client binary, HTTP %d' % status
+    raise CipdBootstrapError('Failed to fetch client binary, HTTP %d' % status)
+  digest = hashlib.sha1(raw_client_bin).hexdigest()
+  if digest != client_info['client_binary']['sha1']:
+    raise CipdBootstrapError('Client SHA1 mismatch')
+
+  # Success.
+  print 'Fetched CIPD client %s:%s at %s' % (package, instance_id, bin_file)
+  write_file(bin_file, raw_client_bin)
+  os.chmod(bin_file, 0755)
+  write_file(version_file, instance_id + '\n')
+  return bin_file, instance_id
+
+
+def call_cipd_api(endpoint, query):
+  """Sends GET request to CIPD backend, parses JSON response."""
+  url = '%s/_ah/api/%s' % (CIPD_BACKEND_URL, endpoint)
+  if query:
+    url += '?' + urllib.urlencode(query)
+  status, body = fetch_url(url)
+  if status != 200:
+    raise CipdBootstrapError('Server replied with HTTP %d' % status)
+  try:
+    body = json.loads(body)
+  except ValueError:
+    raise CipdBootstrapError('Server returned invalid JSON')
+  status = body.get('status')
+  if status != 'SUCCESS':
+    m = body.get('error_message') or '<no error message>'
+    raise CipdBootstrapError('Server replied with error %s: %s' % (status, m))
+  return body
+
+
+def fetch_url(url, headers=None):
+  """Sends GET request (with retries).
+
+  Args:
+    url: URL to fetch.
+    headers: dict with request headers.
+
+  Returns:
+    (200, reply body) on success.
+    (HTTP code, None) on HTTP 401, 403, or 404 reply.
+
+  Raises:
+    Whatever urllib2 raises.
+  """
+  req = urllib2.Request(url)
+  req.add_header('User-Agent', 'cipd recipe bootstrap.py')
+  for k, v in (headers or {}).iteritems():
+    req.add_header(str(k), str(v))
+  i = 0
+  while True:
+    i += 1
+    try:
+      print 'GET %s' % url
+      return 200, urllib2.urlopen(req, timeout=60).read()
+    except Exception as e:
+      if isinstance(e, urllib2.HTTPError):
+        print 'Failed to fetch %s, server returned HTTP %d' % (url, e.code)
+        if e.code in (401, 403, 404):
+          return e.code, None
+      else:
+        print 'Failed to fetch %s' % url
+      if i == 20:
+        raise
+    print 'Retrying in %d sec.' % i
+    time.sleep(i)
+
+
+def ensure_directory(path):
+  """Creates a directory."""
+  # Handle a case where a file is being converted into a directory.
+  chunks = path.split(os.sep)
+  for i in xrange(len(chunks)):
+    p = os.sep.join(chunks[:i+1])
+    if os.path.exists(p) and not os.path.isdir(p):
+      os.remove(p)
+      break
+  try:
+    os.makedirs(path)
+  except OSError as e:
+    if e.errno != errno.EEXIST:
+      raise
+
+
+def read_file(path):
+  """Returns contents of a file or None if missing."""
+  try:
+    with open(path, 'r') as f:
+      return f.read()
+  except IOError as e:
+    if e.errno == errno.ENOENT:
+      return None
+    raise
+
+
+def write_file(path, data):
+  """Puts a file on disk, atomically."""
+  ensure_directory(os.path.dirname(path))
+  fd, temp_file = tempfile.mkstemp(dir=os.path.dirname(path))
+  with os.fdopen(fd, 'w') as f:
+    f.write(data)
+  if not sys.platform in ('linux2', 'darwin'):
+    # On windows we should remove destination file if it exists.
+    if os.path.exists(path):
+      os.remove(path)
+    # At this point we may crash, and it's OK, as next time we'll just
+    # re-install CIPD from scratch.
+  os.rename(temp_file, path)
+
+
+def dump_json(obj):
+  """Pretty-formats object to JSON."""
+  return json.dumps(obj, indent=2, sort_keys=True, separators=(',',':'))
+
+
+def main(args):
+  parser = argparse.ArgumentParser('bootstrap cipd')
+  parser.add_argument('--json-output', default=None)
+  parser.add_argument('--version', default=None)
+  parser.add_argument('--platform', required=True)
+  parser.add_argument('--dest-directory', required=True)
+  opts = parser.parse_args(args)
+
+  package = "infra/tools/cipd/%s" % opts.platform
+  version = opts.version or CLIENT_VERSIONS[opts.platform]
+
+  try:
+    exe_path, instance_id = install_cipd_client(opts.dest_directory,
+                                                package, version)
+    result = {
+      'executable': exe_path,
+      'instance_id': instance_id
+    }
+    if opts.json_output:
+      with open(opts.json_output, 'w') as f:
+        json.dump(result, f)
+  except Exception as e:
+    print 'Exception installing cipd: %s' % e
+    _exc_type, _exc_value, exc_traceback = sys.exc_info()
+    traceback.print_tb(exc_traceback)
+    return 1
+
+  return 0
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))

data/vendor/depot_tools/recipe_modules/cipd/test_api.py

@@ -0,0 +1,102 @@
+# 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.
+
+from recipe_engine import recipe_test_api
+
+
+class CIPDTestApi(recipe_test_api.RecipeTestApi):
+  def make_resolved_version(self, v):
+    if not v:
+      return '40-chars-fake-of-the-package-instance_id'
+    if len(v) == 40:
+      return v
+    # Truncate or pad to 40 chars.
+    prefix = 'resolved-instance_id-of-'
+    if len(v) + len(prefix) >= 40:
+      return '%s%s' % (prefix, v[:40-len(prefix)])
+    return '%s%s%s' % (prefix, v, '-' * (40 - len(prefix) - len(v)))
+
+  def make_pin(self, package_name, version=None):
+    return {
+        'package': package_name,
+        'instance_id': self.make_resolved_version(version),
+    }
+
+  def _resultify(self, result, error=None, retcode=None):
+    dic = {'result': result}
+    if error:
+      dic['error'] = error
+    return self.m.json.output(dic, retcode=retcode)
+
+  def make_test_executable(self):
+    return str(self.m.path['slave_build'].join('cipd', 'cipd'))
+
+  def example_error(self, error, retcode=None):
+    return self._resultify(
+        result=None,
+        error=error,
+        retcode=1 if retcode is None else retcode)
+
+  def example_install_client(self, package_name, version=None, retcode=None):
+    return self.m.json.output({
+        'executable': self.make_test_executable(),
+        'instance_id': self.make_resolved_version(version),
+    }, retcode=retcode)
+
+  def example_build(self, package_name, version=None):
+    return self._resultify(self.make_pin(package_name, version))
+
+  example_register = example_build
+
+  def example_ensure(self, packages):
+    return self._resultify([self.make_pin(name, version)
+                            for name, version in sorted(packages.items())])
+
+  def example_set_tag(self, package_name, version):
+    return self._resultify({
+        'package': package_name,
+        'pin': self.make_pin(package_name, version)
+    })
+
+  example_set_ref = example_set_tag
+
+  def example_search(self, package_name, instances=None):
+    if instances is None:
+      # Return one instance by default.
+      return self._resultify([self.make_pin(package_name)])
+    if isinstance(instances, int):
+      instances = ['instance_id_%i' % (i+1) for i in xrange(instances)]
+    return self._resultify([self.make_pin(package_name, instance)
+                            for instance in instances])
+
+  def example_describe(self, package_name, version=None,
+                       test_data_refs=None, test_data_tags=None,
+                       user='user:44-blablbla@developer.gserviceaccount.com',
+                       tstamp=1446574210):
+    assert not test_data_tags or all(':' in tag for tag in test_data_tags)
+    return self._resultify({
+        'pin': self.make_pin(package_name, version),
+        'registered_by': user,
+        'registered_ts': tstamp,
+        'refs': [
+          {
+            'ref': ref,
+            'modified_by': user,
+            'modified_ts': tstamp,
+          }
+          for ref in (['latest'] if test_data_refs is None else test_data_refs)
+        ],
+        'tags': [
+          {
+            'tag': tag,
+            'registered_by': user,
+            'registered_ts': tstamp,
+          }
+          for tag in ([
+              'buildbot_build:some.waterfall/builder/1234',
+              'git_repository:https://chromium.googlesource.com/some/repo',
+              'git_revision:397a2597cdc237f3026e6143b683be4b9ab60540',
+          ] if test_data_tags is None else test_data_tags)
+        ],
+    })

data/vendor/depot_tools/recipe_modules/gclient/api.py

@@ -151,40 +151,30 @@ class GclientApi(recipe_api.RecipeApi):
     test_data_paths = set(cfg.got_revision_mapping.keys() +
                           [s.name for s in cfg.solutions])
     step_test_data = lambda: (
-      self.test_api.output_json(test_data_paths, cfg.GIT_MODE))
+      self.test_api.output_json(test_data_paths))
     try:
-      if not cfg.GIT_MODE:
-        args = ['sync', '--nohooks', '--force', '--verbose']
-        if cfg.delete_unversioned_trees:
-          args.append('--delete_unversioned_trees')
-        if with_branch_heads:
-          args.append('--with_branch_heads')
-        self('sync', args + revisions + ['--output-json', self.m.json.output()],
-                   step_test_data=step_test_data,
-                   **kwargs)
-      else:
-        # clean() isn't used because the gclient sync flags passed in checkout()
-        # do much the same thing, and they're more correct than doing a separate
-        # 'gclient revert' because it makes sure the other args are correct when
-        # a repo was deleted and needs to be re-cloned (notably
-        # --with_branch_heads), whereas 'revert' uses default args for clone
-        # operations.
-        #
-        # TODO(mmoss): To be like current official builders, this step could
-        # just delete the whole <slave_name>/build/ directory and start each
-        # build from scratch. That might be the least bad solution, at least
-        # until we have a reliable gclient method to produce a pristine working
-        # dir for git-based builds (e.g. maybe some combination of 'git
-        # reset/clean -fx' and removing the 'out' directory).
-        j = '-j2' if self.m.platform.is_win else '-j8'
-        args = ['sync', '--verbose', '--with_branch_heads', '--nohooks', j,
-                '--reset', '--force', '--upstream', '--no-nag-max']
-        if cfg.delete_unversioned_trees:
-          args.append('--delete_unversioned_trees')
-        self('sync', args + revisions +
-                   ['--output-json', self.m.json.output()],
-                   step_test_data=step_test_data,
-                   **kwargs)
+      # clean() isn't used because the gclient sync flags passed in checkout()
+      # do much the same thing, and they're more correct than doing a separate
+      # 'gclient revert' because it makes sure the other args are correct when
+      # a repo was deleted and needs to be re-cloned (notably
+      # --with_branch_heads), whereas 'revert' uses default args for clone
+      # operations.
+      #
+      # TODO(mmoss): To be like current official builders, this step could
+      # just delete the whole <slave_name>/build/ directory and start each
+      # build from scratch. That might be the least bad solution, at least
+      # until we have a reliable gclient method to produce a pristine working
+      # dir for git-based builds (e.g. maybe some combination of 'git
+      # reset/clean -fx' and removing the 'out' directory).
+      j = '-j2' if self.m.platform.is_win else '-j8'
+      args = ['sync', '--verbose', '--with_branch_heads', '--nohooks', j,
+              '--reset', '--force', '--upstream', '--no-nag-max']
+      if cfg.delete_unversioned_trees:
+        args.append('--delete_unversioned_trees')
+      self('sync', args + revisions +
+                 ['--output-json', self.m.json.output()],
+                 step_test_data=step_test_data,
+                 **kwargs)
     finally:
       result = self.m.step.active_result
       data = result.json.output
@@ -239,25 +229,16 @@ class GclientApi(recipe_api.RecipeApi):
 
     sync_step = None
     try:
-      if not cfg.GIT_MODE:
-        try:
-          if revert:
-            self.revert(**kwargs)
-        finally:
-          sync_step = self.sync(cfg, with_branch_heads=with_branch_heads,
-                                **kwargs)
-      else:
-        sync_step = self.sync(cfg, with_branch_heads=with_branch_heads,
-                              **kwargs)
-
-        cfg_cmds = [
-          ('user.name', 'local_bot'),
-          ('user.email', 'local_bot@example.com'),
-        ]
-        for var, val in cfg_cmds:
-          name = 'recurse (git config %s)' % var
-          self(name, ['recurse', 'git', 'config', var, val], **kwargs)
-
+      sync_step = self.sync(cfg, with_branch_heads=with_branch_heads,
+                            **kwargs)
+
+      cfg_cmds = [
+        ('user.name', 'local_bot'),
+        ('user.email', 'local_bot@example.com'),
+      ]
+      for var, val in cfg_cmds:
+        name = 'recurse (git config %s)' % var
+        self(name, ['recurse', 'git', 'config', var, val], **kwargs)
     finally:
       cwd = kwargs.get('cwd', self.m.path['slave_build'])
       if 'checkout' not in self.m.path:
@@ -266,7 +247,7 @@ class GclientApi(recipe_api.RecipeApi):
 
     return sync_step
 
-  def revert(self, **kwargs):
+  def revert(self, **kwargs):  # pragma: no cover
     """Return a gclient_safe_revert step."""
     # Not directly calling gclient, so don't use self().
     alias = self.spec_alias

data/vendor/depot_tools/recipe_modules/gclient/config.py

@@ -10,17 +10,16 @@ from recipe_engine.config import ConfigList, Dict, Single, Static, Set, List
 from . import api as gclient_api
 
 
-def BaseConfig(USE_MIRROR=True, GIT_MODE=False, CACHE_DIR=None,
+def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
                PATCH_PROJECT=None, BUILDSPEC_VERSION=None,
                **_kwargs):
-  deps = '.DEPS.git' if GIT_MODE else 'DEPS'
   cache_dir = str(CACHE_DIR) if CACHE_DIR else None
   return ConfigGroup(
     solutions = ConfigList(
       lambda: ConfigGroup(
         name = Single(basestring),
         url = Single(basestring),
-        deps_file = Single(basestring, empty_val=deps, required=False,
+        deps_file = Single(basestring, empty_val='.DEPS.git', required=False,
                            hidden=False),
         managed = Single(bool, empty_val=True, required=False, hidden=False),
         custom_deps = Dict(value_type=(basestring, types.NoneType)),
@@ -86,7 +85,6 @@ def BaseConfig(USE_MIRROR=True, GIT_MODE=False, CACHE_DIR=None,
         required=False,
         hidden=True),
 
-    GIT_MODE = Static(bool(GIT_MODE)),
     USE_MIRROR = Static(bool(USE_MIRROR)),
     # TODO(tandrii): remove PATCH_PROJECT field.
     # DON'T USE THIS. WILL BE REMOVED.
@@ -96,43 +94,18 @@ def BaseConfig(USE_MIRROR=True, GIT_MODE=False, CACHE_DIR=None,
 
 config_ctx = config_item_context(BaseConfig)
 
-def ChromiumSvnSubURL(c, *pieces):
-  BASES = ('https://src.chromium.org',
-           'svn://svn-mirror.golo.chromium.org')
-  return '/'.join((BASES[c.USE_MIRROR],) + pieces)
-
 def ChromiumGitURL(_c, *pieces):
   return '/'.join(('https://chromium.googlesource.com',) + pieces)
 
 def ChromiumSrcURL(c):
-  # TODO(phajdan.jr): Move to proper repo and add coverage.
-  if c.GIT_MODE:  # pragma: no cover
-    return ChromiumGitURL(c, 'chromium', 'src.git')
-  else:
-    return ChromiumSvnSubURL(c, 'chrome', 'trunk', 'src')
-
-def BlinkURL(c):
-  # TODO(phajdan.jr): Move to proper repo and add coverage.
-  if c.GIT_MODE:  # pragma: no cover
-    return ChromiumGitURL(c, 'chromium', 'blink.git')
-  else:
-    return ChromiumSvnSubURL(c, 'blink', 'trunk')
-
-def ChromeSvnSubURL(c, *pieces):
-  BASES = ('svn://svn.chromium.org',
-           'svn://svn-mirror.golo.chromium.org')
-  return '/'.join((BASES[c.USE_MIRROR],) + pieces)
+  return ChromiumGitURL(c, 'chromium', 'src.git')
 
 # TODO(phajdan.jr): Move to proper repo and add coverage.
 def ChromeInternalGitURL(_c, *pieces):  # pragma: no cover
   return '/'.join(('https://chrome-internal.googlesource.com',) + pieces)
 
 def ChromeInternalSrcURL(c):
-  # TODO(phajdan.jr): Move to proper repo and add coverage.
-  if c.GIT_MODE:  # pragma: no cover
-    return ChromeInternalGitURL(c, 'chrome', 'src-internal.git')
-  else:
-    return ChromeSvnSubURL(c, 'chrome-internal', 'trunk', 'src-internal')
+  return ChromeInternalGitURL(c, 'chrome', 'src-internal.git')
 
 def mirror_only(c, obj, default=None):
   return obj if c.USE_MIRROR else (default or obj.__class__())
@@ -142,11 +115,7 @@ def chromium_bare(c):
   s = c.solutions.add()
   s.name = 'src'
   s.url = ChromiumSrcURL(c)
-  s.custom_vars = mirror_only(c, {
-    'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s',
-    'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk',
-    'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s',
-    'webkit_trunk': BlinkURL(c)})
+  s.custom_vars = {}
   m = c.got_revision_mapping
   m['src'] = 'got_revision'
   m['src/native_client'] = 'got_nacl_revision'
@@ -165,14 +134,15 @@ def chromium_bare(c):
   p['parent_got_webrtc_revision'] = 'webrtc_revision'
 
   p = c.patch_projects
-  p['v8'] = ('src/v8', 'HEAD')
-  p['buildtools'] = ('src/buildtools', 'HEAD')
   p['angle/angle'] = ('src/third_party/angle', None)
   p['blink'] = ('src/third_party/WebKit', None)
+  p['buildtools'] = ('src/buildtools', 'HEAD')
   p['catapult'] = ('src/third_party/catapult', 'HEAD')
+  p['flac'] = ('src/third_party/flac', 'HEAD')
+  p['icu'] = ('src/third_party/icu', 'HEAD')
   p['pdfium'] = ('src/third_party/pdfium', 'HEAD')
   p['skia'] = ('src/third_party/skia', 'HEAD')
-  p['flac'] = ('src/third_party/flac', 'HEAD')
+  p['v8'] = ('src/v8', 'HEAD')
   p['webrtc'] = ('src/third_party/webrtc', 'HEAD')
 
 @config_ctx(includes=['chromium_bare'])
@@ -186,24 +156,12 @@ def chromium(c):
 
 @config_ctx(includes=['chromium'])
 def chromium_lkcr(c):
-  # TODO(phajdan.jr): Add git hashes for LKCR crbug.com/349277.
-  if c.GIT_MODE:
-    raise BadConf('Git has problems with safesync_url and LKCR, '
-                  'crbug.com/349277 crbug.com/109191')  # pragma: no cover
   s = c.solutions[0]
-  s.safesync_url = 'https://build.chromium.org/p/chromium/lkcr-status/lkgr'
-  # TODO(hinoka): Once lkcr exists and is a tag, it should just be lkcr
-  #               rather than origin/lkcr.
   s.revision = 'origin/lkcr'
 
 @config_ctx(includes=['chromium'])
 def chromium_lkgr(c):
   s = c.solutions[0]
-  safesync_url = 'https://chromium-status.appspot.com/lkgr'
-  if c.GIT_MODE:  # pragma: no cover
-    safesync_url = 'https://chromium-status.appspot.com/git-lkgr'
-    raise BadConf('Git has problems with safesync_url, crbug.com/109191.')
-  s.safesync_url = safesync_url
   s.revision = 'origin/lkgr'
 
 @config_ctx(includes=['chromium_bare'])
@@ -286,46 +244,6 @@ def v8_bleeding_edge_git(c):
 def v8_canary(c):
   c.revisions['src/v8'] = 'origin/canary'
 
-@config_ctx(includes=['chromium'])
-def oilpan(c):  # pragma: no cover
-  if c.GIT_MODE:
-    raise BadConf("Oilpan requires SVN for now")
-  c.solutions[0].custom_vars = {
-    'webkit_trunk': ChromiumSvnSubURL(c, 'blink', 'branches', 'oilpan')
-  }
-  c.solutions[0].custom_vars['sourceforge_url'] = mirror_only(
-    c,
-    'svn://svn-mirror.golo.chromium.org/%(repo)s',
-    'svn://svn.chromium.org/%(repo)s'
-  )
-
-  c.revisions['src/third_party/WebKit'] = 'HEAD'
-  c.solutions[0].revision = '197341'
-
-  c.solutions[0].custom_deps = {
-    'src/chrome/tools/test/reference_build/chrome_linux' :
-      ChromiumSvnSubURL(c, 'blink', 'branches', 'oilpan', 'Tools',
-                        'reference_build', 'chrome_linux')
-  }
-  del c.got_revision_mapping['src']
-  c.got_revision_mapping['src/third_party/WebKit/Source'] = 'got_revision'
-
-@config_ctx(includes=['oilpan', 'chrome_internal'])
-def oilpan_internal(c):  # pragma: no cover
-  # Add back the oilpan data dependencies
-  needed_components_internal = [
-    "src/data/memory_test",
-    "src/data/mozilla_js_tests",
-    "src/data/page_cycler",
-    "src/data/tab_switching",
-    "src/webkit/data/bmp_decoder",
-    "src/webkit/data/ico_decoder",
-    "src/webkit/data/test_shell/plugins",
-    "src/webkit/data/xbm_decoder",
-  ]
-  for key in needed_components_internal:
-    del c.solutions[1].custom_deps[key]
-
 @config_ctx()
 def nacl(c):
   s = c.solutions.add()
@@ -360,49 +278,39 @@ def gyp(c):
   m = c.got_revision_mapping
   m['gyp'] = 'got_revision'
 
-@config_ctx(config_vars={'GIT_MODE': True})
-def build(c):  # pragma: no cover
-  if not c.GIT_MODE:
-    raise BadConf('build only supports git')
+@config_ctx()
+def build(c):
   s = c.solutions.add()
   s.name = 'build'
   s.url = ChromiumGitURL(c, 'chromium', 'tools', 'build.git')
   m = c.got_revision_mapping
   m['build'] = 'got_revision'
 
-@config_ctx(config_vars={'GIT_MODE': True})
+@config_ctx()
 def depot_tools(c):  # pragma: no cover
-  if not c.GIT_MODE:
-    raise BadConf('depot_tools only supports git')
   s = c.solutions.add()
   s.name = 'depot_tools'
   s.url = ChromiumGitURL(c, 'chromium', 'tools', 'depot_tools.git')
   m = c.got_revision_mapping
   m['depot_tools'] = 'got_revision'
 
-@config_ctx(config_vars={'GIT_MODE': True})
+@config_ctx()
 def skia(c):  # pragma: no cover
-  if not c.GIT_MODE:
-    raise BadConf('skia only supports git')
   s = c.solutions.add()
   s.name = 'skia'
   s.url = 'https://skia.googlesource.com/skia.git'
   m = c.got_revision_mapping
   m['skia'] = 'got_revision'
 
-@config_ctx(config_vars={'GIT_MODE': True})
-def chrome_golo(c): # pragma: no cover
-  if not c.GIT_MODE:
-    raise BadConf('chrome_golo only supports git')
+@config_ctx()
+def chrome_golo(c):  # pragma: no cover
   s = c.solutions.add()
   s.name = 'chrome_golo'
   s.url = 'https://chrome-internal.googlesource.com/chrome-golo/chrome-golo.git'
   c.got_revision_mapping['chrome_golo'] = 'got_revision'
 
-@config_ctx(config_vars={'GIT_MODE': True})
+@config_ctx()
 def build_internal(c):
-  if not c.GIT_MODE:  # pragma: no cover
-    raise BadConf('build_internal only supports git')
   s = c.solutions.add()
   s.name = 'build_internal'
   s.url = 'https://chrome-internal.googlesource.com/chrome/tools/build.git'
@@ -413,10 +321,8 @@ def build_internal(c):
   build(c)
   c.got_revision_mapping['build'] = 'got_build_revision'
 
-@config_ctx(config_vars={'GIT_MODE': True})
+@config_ctx()
 def build_internal_scripts_slave(c):
-  if not c.GIT_MODE:  # pragma: no cover
-    raise BadConf('build_internal_scripts_slave only supports git')
   s = c.solutions.add()
   s.name = 'build_internal/scripts/slave'
   s.url = ('https://chrome-internal.googlesource.com/'
@@ -455,7 +361,6 @@ def internal_deps(c):
 @config_ctx(includes=['chromium', 'chrome_internal'])
 def perf(c):
   s = c.solutions[0]
-  s.custom_vars['llvm_url'] = 'svn://svn-mirror.golo.chromium.org/llvm-project'
   s.managed = False
   needed_components_internal = [
     "src/data/page_cycler",
@@ -547,7 +452,7 @@ def dart(c):
   soln.deps_file = 'DEPS'
   soln.managed = False
 
-@config_ctx(config_vars={'GIT_MODE': True})
+@config_ctx()
 def infra(c):
   soln = c.solutions.add()
   soln.name = 'infra'
@@ -560,7 +465,7 @@ def infra(c):
   p['recipes-py'] = ('infra/recipes-py', 'HEAD')
   p['recipe_engine'] = ('infra/recipes-py', 'HEAD')
 
-@config_ctx(config_vars={'GIT_MODE': True})
+@config_ctx()
 def infra_internal(c):  # pragma: no cover
   soln = c.solutions.add()
   soln.name = 'infra_internal'
@@ -611,7 +516,7 @@ def recipes_py(c):
   del m['infra']
   m['infra/recipes-py'] = 'got_revision'
 
-@config_ctx(config_vars={'GIT_MODE': True})
+@config_ctx()
 def recipes_py_bare(c):
   soln = c.solutions.add()
   soln.name = 'recipes-py'
@@ -619,17 +524,6 @@ def recipes_py_bare(c):
               'luci/recipes-py')
   c.got_revision_mapping['recipes-py'] = 'got_revision'
 
-@config_ctx()
-def chrome_from_buildspec(c):  # pragma: no cover
-  soln = c.solutions.add()
-  soln.name = 'chrome_from_buildspec'
-  # This URL has to be augmented with the appropriate bucket by the recipe using
-  # it.
-  soln.url = ('svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/tools/'
-      'buildspec/build/')
-  soln.custom_vars['svn_url'] = 'svn://svn-mirror.golo.chromium.org'
-  soln.custom_deps = {}
-
 @config_ctx()
 def catapult(c):
   soln = c.solutions.add()
@@ -638,7 +532,7 @@ def catapult(c):
               'catapult-project/catapult.git')
   c.got_revision_mapping['catapult'] = 'got_revision'
 
-@config_ctx(includes=['infra_internal'], config_vars={'GIT_MODE': True})
+@config_ctx(includes=['infra_internal'])
 def infradata_master_manager(c):
   soln = c.solutions.add()
   soln.name = 'infra-data-master-manager'
@@ -688,4 +582,4 @@ def chromedriver(c):
   """Add Selenium Java tests to the gclient solution."""
   c.solutions[0].custom_deps[
       'src/chrome/test/chromedriver/third_party/java_tests'] = (
-          ChromiumGitURL(c, 'chromium', 'deps', 'webdriver'))
+          ChromiumGitURL(c, 'chromium', 'deps', 'webdriver'))