libv8 5.7.492.65.1 → 5.9.211.38.0beta0

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

@@ -80,12 +80,12 @@ class GclientApi(recipe_api.RecipeApi):
       prefix = ('[spec: %s] ' % self.spec_alias) + prefix
 
     # TODO(phajdan.jr): create a helper for adding to PATH.
-    env = self.m.step.get_from_context('env', {})
+    env = self.m.context.env
     env.setdefault('PATH', '%(PATH)s')
     env['PATH'] = self.m.path.pathsep.join([
         env['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
 
-    with self.m.step.context({'env': env}):
+    with self.m.context(env=env):
       return self.m.python(prefix + name,
                            self.package_repo_resource('gclient.py'),
                            cmd,
@@ -126,6 +126,24 @@ class GclientApi(recipe_api.RecipeApi):
   def config_to_pythonish(cfg):
     return jsonish_to_python(cfg.as_jsonish(), True)
 
+  # TODO(machenbach): Remove this method when the old mapping is deprecated.
+  @staticmethod
+  def got_revision_reverse_mapping(cfg):
+    """Returns the merged got_revision_reverse_mapping.
+
+    Returns (dict): A mapping from property name -> project name. It merges the
+        values of the deprecated got_revision_mapping and the new
+        got_revision_reverse_mapping.
+    """
+    rev_map = cfg.got_revision_mapping.as_jsonish()
+    reverse_rev_map = cfg.got_revision_reverse_mapping.as_jsonish()
+    combined_length = len(rev_map) + len(reverse_rev_map)
+    reverse_rev_map.update({v: k for k, v in rev_map.iteritems()})
+
+    # Make sure we never have duplicate values in the old map.
+    assert combined_length == len(reverse_rev_map)
+    return reverse_rev_map
+
   def resolve_revision(self, revision):
     if hasattr(revision, 'resolve'):
       return revision.resolve(self.m.properties)
@@ -148,7 +166,7 @@ class GclientApi(recipe_api.RecipeApi):
       if fixed_revision:
         revisions.extend(['--revision', '%s@%s' % (name, fixed_revision)])
 
-    test_data_paths = set(cfg.got_revision_mapping.keys() +
+    test_data_paths = set(self.got_revision_reverse_mapping(cfg).values() +
                           [s.name for s in cfg.solutions])
     step_test_data = lambda: (
       self.test_api.output_json(test_data_paths))
@@ -177,12 +195,12 @@ class GclientApi(recipe_api.RecipeApi):
                  **kwargs)
     finally:
       result = self.m.step.active_result
-      data = result.json.output
-      for path, info in data['solutions'].iteritems():
+      solutions = result.json.output['solutions']
+      for propname, path in sorted(
+          self.got_revision_reverse_mapping(cfg).iteritems()):
         # gclient json paths always end with a slash
-        path = path.rstrip('/')
-        if path in cfg.got_revision_mapping:
-          propname = cfg.got_revision_mapping[path]
+        info = solutions.get(path + '/') or solutions.get(path)
+        if info:
           result.presentation.properties[propname] = info['revision']
 
     return result
@@ -250,12 +268,8 @@ class GclientApi(recipe_api.RecipeApi):
   def runhooks(self, args=None, name='runhooks', **kwargs):
     args = args or []
     assert isinstance(args, (list, tuple))
-    context = {}
-    if not self.m.step.get_from_context('cwd') and self.m.path['checkout']:
-      context['cwd'] = self.m.path['checkout']
-    with self.m.step.context(context):
-      return self(
-        name, ['runhooks'] + list(args), infra_step=False, **kwargs)
+    with self.m.context(cwd=(self.m.context.cwd or self.m.path['checkout'])):
+      return self(name, ['runhooks'] + list(args), infra_step=False, **kwargs)
 
   @property
   def is_blink_mode(self):

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

@@ -42,8 +42,13 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
     src_root = Single(basestring, required=False, hidden=True),
 
     # Maps 'solution' -> build_property
+    # TODO(machenbach): Deprecate this in favor of the one below.
+    # http://crbug.com/713356
     got_revision_mapping = Dict(hidden=True),
 
+    # Maps build_property -> 'solution'
+    got_revision_reverse_mapping = Dict(hidden=True),
+
     # Addition revisions we want to pass in.  For now theres a duplication
     # of code here of setting custom vars AND passing in --revision. We hope
     # to remove custom vars later.
@@ -85,6 +90,8 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
         required=False,
         hidden=True),
 
+    disable_syntax_validation = Single(bool, empty_val=False, required=False),
+
     USE_MIRROR = Static(bool(USE_MIRROR)),
     # TODO(tandrii): remove PATCH_PROJECT field.
     # DON'T USE THIS. WILL BE REMOVED.
@@ -97,154 +104,18 @@ config_ctx = config_item_context(BaseConfig)
 def ChromiumGitURL(_c, *pieces):
   return '/'.join(('https://chromium.googlesource.com',) + pieces)
 
-def ChromiumSrcURL(c):
-  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):
-  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__())
-
-@config_ctx()
-def chromium_bare(c):
-  s = c.solutions.add()
-  s.name = 'src'
-  s.url = ChromiumSrcURL(c)
-  s.custom_vars = {}
-  m = c.got_revision_mapping
-  m['src'] = 'got_revision'
-  m['src/native_client'] = 'got_nacl_revision'
-  m['src/tools/swarming_client'] = 'got_swarming_client_revision'
-  m['src/v8'] = 'got_v8_revision'
-  m['src/third_party/angle'] = 'got_angle_revision'
-  m['src/third_party/webrtc'] = 'got_webrtc_revision'
-  m['src/buildtools'] = 'got_buildtools_revision'
-
-  p = c.parent_got_revision_mapping
-  p['parent_got_revision'] = None
-  p['parent_got_angle_revision'] = 'angle_revision'
-  p['parent_got_nacl_revision'] = 'nacl_revision'
-  p['parent_got_swarming_client_revision'] = 'swarming_revision'
-  p['parent_got_v8_revision'] = 'v8_revision'
-  p['parent_got_webrtc_revision'] = 'webrtc_revision'
-
-  p = c.patch_projects
-  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['v8'] = ('src/v8', 'HEAD')
-  p['v8/v8'] = ('src/v8', 'HEAD')
-  p['webrtc'] = ('src/third_party/webrtc', 'HEAD')
-
-@config_ctx(includes=['chromium_bare'])
-def chromium_empty(c):
-  c.solutions[0].deps_file = ''  # pragma: no cover
-
-@config_ctx(includes=['chromium_bare'])
-def chromium(c):
-  s = c.solutions[0]
-  s.custom_deps = mirror_only(c, {})
-
-@config_ctx(includes=['chromium'])
-def chromium_lkcr(c):
-  s = c.solutions[0]
-  s.revision = 'origin/lkcr'
-
-@config_ctx(includes=['chromium'])
-def chromium_lkgr(c):
-  s = c.solutions[0]
-  s.revision = 'origin/lkgr'
-
-@config_ctx(includes=['chromium_bare'])
-def android_bare(c):
-  # We inherit from chromium_bare to get the got_revision mapping.
-  # NOTE: We don't set a specific got_revision mapping for src/repo.
-  del c.solutions[0]
-  c.got_revision_mapping['src'] = 'got_src_revision'
-  s = c.solutions.add()
-  s.deps_file = '.DEPS.git'
-
-# TODO(iannucci,vadimsh): Switch this to src-limited
 @config_ctx()
-def chrome_internal(c):
-  s = c.solutions.add()
-  s.name = 'src-internal'
-  s.url = ChromeInternalSrcURL(c)
-  # Remove some things which are generally not needed
-  s.custom_deps = {
-    "src/data/autodiscovery" : None,
-    "src/data/page_cycler" : None,
-    "src/tools/grit/grit/test/data" : None,
-    "src/chrome/test/data/perf/frame_rate/private" : None,
-    "src/data/mozilla_js_tests" : None,
-    "src/chrome/test/data/firefox2_profile/searchplugins" : None,
-    "src/chrome/test/data/firefox2_searchplugins" : None,
-    "src/chrome/test/data/firefox3_profile/searchplugins" : None,
-    "src/chrome/test/data/firefox3_searchplugins" : None,
-    "src/chrome/test/data/ssl/certs" : None,
-    "src/data/mach_ports" : None,
-    "src/data/esctf" : None,
-    "src/data/selenium_core" : None,
-    "src/chrome/test/data/plugin" : None,
-    "src/data/memory_test" : None,
-    "src/data/tab_switching" : None,
-    "src/chrome/test/data/osdd" : None,
-    "src/webkit/data/bmp_decoder":None,
-    "src/webkit/data/ico_decoder":None,
-    "src/webkit/data/test_shell/plugins":None,
-    "src/webkit/data/xbm_decoder":None,
-  }
-
-@config_ctx(includes=['chromium'])
-def blink(c):
-  c.solutions[0].revision = 'HEAD'
-  del c.solutions[0].custom_deps
-  c.revisions['src/third_party/WebKit'] = 'HEAD'
-
-# TODO(phajdan.jr): Move to proper repo and add coverage.
-@config_ctx(includes=['chromium'])
-def blink_merged(c):  # pragma: no cover
-  c.solutions[0].url = \
-      'https://chromium.googlesource.com/playground/chromium-blink-merge.git'
+def disable_syntax_validation(c):
+  c.disable_syntax_validation = True
 
 @config_ctx()
 def android(c):
   c.target_os.add('android')
 
-@config_ctx(includes=['chromium', 'chrome_internal'])
-def ios(c):
-  c.target_os.add('ios')
-
-@config_ctx(includes=['chromium'])
-def show_v8_revision(c):
-  # Have the V8 revision appear in the web UI instead of Chromium's.
-  c.got_revision_mapping['src'] = 'got_cr_revision'
-  c.got_revision_mapping['src/v8'] = 'got_revision'
-  # Needed to get the testers to properly sync the right revision.
-  c.parent_got_revision_mapping['parent_got_revision'] = 'got_revision'
-
-@config_ctx(includes=['chromium'])
-def v8_bleeding_edge_git(c):
-  c.solutions[0].revision = 'HEAD'
-  # TODO(machenbach): If bot_update is activated for all v8-chromium bots
-  # and there's no gclient fallback, then the following line can be removed.
-  c.solutions[0].custom_vars['v8_branch'] = 'branches/bleeding_edge'
-  c.revisions['src/v8'] = 'HEAD'
-
-@config_ctx()
-def v8_canary(c):
-  c.revisions['src/v8'] = 'origin/canary'
-
 @config_ctx()
 def nacl(c):
   s = c.solutions.add()
@@ -359,74 +230,6 @@ def internal_deps(c):
            'chrome/tools/build/internal.DEPS.git')
   c.got_revision_mapping['build_internal/internal.DEPS'] = 'got_revision'
 
-@config_ctx(includes=['chromium', 'chrome_internal'])
-def perf(c):
-  s = c.solutions[0]
-  s.managed = False
-  needed_components_internal = [
-    "src/data/page_cycler",
-  ]
-  for key in needed_components_internal:
-    del c.solutions[1].custom_deps[key]
-  c.solutions[1].managed = False
-
-@config_ctx(includes=['chromium', 'chrome_internal'])
-def chromium_perf(c):
-  pass
-
-@config_ctx(includes=['chromium_perf', 'android'])
-def chromium_perf_android(c):
-  pass
-
-@config_ctx(includes=['chromium'])
-def chromium_skia(c):
-  c.solutions[0].revision = 'HEAD'
-  del c.solutions[0].custom_deps
-  c.revisions['src/third_party/skia'] = (
-      gclient_api.RevisionFallbackChain('origin/master'))
-  c.got_revision_mapping['src'] = 'got_chromium_revision'
-  c.got_revision_mapping['src/third_party/skia'] = 'got_revision'
-  c.parent_got_revision_mapping['parent_got_revision'] = 'got_revision'
-
-@config_ctx(includes=['chromium'])
-def chromium_webrtc(c):
-  c.got_revision_mapping['src/third_party/libvpx/source'] = (
-      'got_libvpx_revision')
-
-@config_ctx(includes=['chromium_webrtc'])
-def chromium_webrtc_tot(c):
-  """Configures WebRTC ToT revision for Chromium src/third_party/webrtc.
-
-  Sets up ToT instead of the DEPS-pinned revision for WebRTC.
-  This is used for some bots to provide data about which revisions are green to
-  roll into Chromium.
-  """
-  c.revisions['src'] = 'HEAD'
-  c.revisions['src/third_party/webrtc'] = 'HEAD'
-
-  # Have the WebRTC revision appear in the web UI instead of Chromium's.
-  # This is also important for set_component_rev to work, since got_revision
-  # will become a WebRTC revision instead of Chromium.
-  c.got_revision_mapping['src'] = 'got_cr_revision'
-  c.got_revision_mapping['src/third_party/webrtc'] = 'got_revision'
-
-  # Needed to get the testers to properly sync the right revision.
-  c.parent_got_revision_mapping['parent_got_revision'] = 'got_revision'
-  c.parent_got_revision_mapping['parent_got_webrtc_revision'] = (
-      'got_webrtc_revision')
-
-@config_ctx()
-def webrtc_test_resources(c):
-  """Add webrtc.DEPS solution for test resources and tools.
-
-  The webrtc.DEPS solution pulls in additional resources needed for running
-  WebRTC-specific test setups in Chromium.
-  """
-  s = c.solutions.add()
-  s.name = 'webrtc.DEPS'
-  s.url = ChromiumGitURL(c, 'chromium', 'deps', 'webrtc', 'webrtc.DEPS')
-  s.deps_file = 'DEPS'
-
 @config_ctx()
 def pdfium(c):
   soln = c.solutions.add()
@@ -547,6 +350,7 @@ def infradata_master_manager(c):
   soln.name = 'infra-data-master-manager'
   soln.url = (
       'https://chrome-internal.googlesource.com/infradata/master-manager.git')
+  del c.got_revision_mapping['infra_internal']
   c.got_revision_mapping['infra-data-master-manager'] = 'got_revision'
 
 @config_ctx()
@@ -562,37 +366,8 @@ def custom_tabs_client(c):
               'GoogleChrome/custom-tabs-client.git')
   c.got_revision_mapping['custom_tabs_client'] = 'got_revision'
 
-# TODO(phajdan.jr): Move to proper repo and add coverage.
-@config_ctx()
-def angle_top_of_tree(c):  # pragma: no cover
-  """Configures the top-of-tree ANGLE in a Chromium checkout.
-
-  Sets up ToT instead of the DEPS-pinned revision for ANGLE.
-  """
-  # TODO(tandrii): I think patch_projects in bare_chromium fixed this.
-  c.solutions[0].revision = 'HEAD'
-  c.revisions['src/third_party/angle'] = 'HEAD'
-
 @config_ctx()
 def gerrit_test_cq_normal(c):
   soln = c.solutions.add()
   soln.name = 'gerrit-test-cq-normal'
   soln.url = 'https://chromium.googlesource.com/playground/gerrit-cq/normal.git'
-
-# TODO(phajdan.jr): Move to proper repo and add coverage.
-@config_ctx()
-def valgrind(c):  # pragma: no cover
-  """Add Valgrind binaries to the gclient solution."""
-  c.solutions[0].custom_deps['src/third_party/valgrind'] = \
-    ChromiumGitURL(c, 'chromium', 'deps', 'valgrind', 'binaries')
-
-@config_ctx(includes=['chromium'])
-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'))
-
-@config_ctx()
-def ndk_next(c):
-  c.revisions['src/third_party/android_tools/ndk'] = 'origin/next'

data/vendor/depot_tools/recipes/recipe_modules/gclient/{example.expected → examples/full.expected}/basic.json

@@ -9,7 +9,7 @@
       "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
     ],
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "gclient setup"
@@ -33,7 +33,7 @@
       "/path/to/tmp/json"
     ],
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "gclient sync",
@@ -60,7 +60,7 @@
       "local_bot"
     ],
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "gclient recurse (git config user.name)"
@@ -77,7 +77,7 @@
       "local_bot@example.com"
     ],
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "gclient recurse (git config user.email)"
@@ -93,7 +93,7 @@
     ],
     "cwd": "[START_DIR]/src/third_party",
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "[spec: Angle] gclient setup"
@@ -120,7 +120,7 @@
     ],
     "cwd": "[START_DIR]/src/third_party",
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "[spec: Angle] gclient sync",
@@ -152,7 +152,7 @@
     ],
     "cwd": "[START_DIR]/src/third_party",
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.name)"
@@ -170,7 +170,7 @@
     ],
     "cwd": "[START_DIR]/src/third_party",
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "infra_step": true,
     "name": "[spec: Angle] gclient recurse (git config user.email)"
@@ -208,7 +208,7 @@
     ],
     "cwd": "[START_DIR]/src",
     "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
   },