Reverse chromium's got_revision_mapping

This migrates chromium to the new mapping after testing it for V8 in 
https://chromium-review.googlesource.com/485579

Also switches dependent gclient configs. This will be a noop downstream.

Bug: 713356
Change-Id: Ic1cb4de139895021dfd35063a9d6c8e7a4e77b9d
Reviewed-on: https://chromium-review.googlesource.com/488604
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
changes/04/488604/6
Michael Achenbach 8 years ago committed by Commit Bot
parent c7e84d0413
commit 801d955c43

@ -121,14 +121,14 @@ def chromium_bare(c):
s.name = 'src' s.name = 'src'
s.url = ChromiumSrcURL(c) s.url = ChromiumSrcURL(c)
s.custom_vars = {} s.custom_vars = {}
m = c.got_revision_mapping m = c.got_revision_reverse_mapping
m['src'] = 'got_revision' m['got_revision'] = 'src'
m['src/native_client'] = 'got_nacl_revision' m['got_nacl_revision'] = 'src/native_client'
m['src/tools/swarming_client'] = 'got_swarming_client_revision' m['got_swarming_client_revision'] = 'src/tools/swarming_client'
m['src/v8'] = 'got_v8_revision' m['got_v8_revision'] = 'src/v8'
m['src/third_party/angle'] = 'got_angle_revision' m['got_angle_revision'] = 'src/third_party/angle'
m['src/third_party/webrtc'] = 'got_webrtc_revision' m['got_webrtc_revision'] = 'src/third_party/webrtc'
m['src/buildtools'] = 'got_buildtools_revision' m['got_buildtools_revision'] = 'src/buildtools'
p = c.parent_got_revision_mapping p = c.parent_got_revision_mapping
p['parent_got_revision'] = None p['parent_got_revision'] = None
@ -175,7 +175,8 @@ def android_bare(c):
# We inherit from chromium_bare to get the got_revision mapping. # We inherit from chromium_bare to get the got_revision mapping.
# NOTE: We don't set a specific got_revision mapping for src/repo. # NOTE: We don't set a specific got_revision mapping for src/repo.
del c.solutions[0] del c.solutions[0]
c.got_revision_mapping['src'] = 'got_src_revision' c.got_revision_reverse_mapping['got_src_revision'] = 'src'
del c.got_revision_reverse_mapping['got_revision']
s = c.solutions.add() s = c.solutions.add()
s.deps_file = '.DEPS.git' s.deps_file = '.DEPS.git'
@ -233,8 +234,10 @@ def ios(c):
@config_ctx(includes=['chromium']) @config_ctx(includes=['chromium'])
def show_v8_revision(c): def show_v8_revision(c):
# Have the V8 revision appear in the web UI instead of Chromium's. # Have the V8 revision appear in the web UI instead of Chromium's.
c.got_revision_mapping['src'] = 'got_cr_revision' c.got_revision_reverse_mapping['got_cr_revision'] = 'src'
c.got_revision_mapping['src/v8'] = 'got_revision' c.got_revision_reverse_mapping['got_revision'] = 'src/v8'
# TODO(machenbach): Retain old behavior for now and switch in separate CL.
del c.got_revision_reverse_mapping['got_v8_revision']
# Needed to get the testers to properly sync the right 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_revision'] = 'got_revision'
@ -389,14 +392,14 @@ def chromium_skia(c):
del c.solutions[0].custom_deps del c.solutions[0].custom_deps
c.revisions['src/third_party/skia'] = ( c.revisions['src/third_party/skia'] = (
gclient_api.RevisionFallbackChain('origin/master')) gclient_api.RevisionFallbackChain('origin/master'))
c.got_revision_mapping['src'] = 'got_chromium_revision' c.got_revision_reverse_mapping['got_chromium_revision'] = 'src'
c.got_revision_mapping['src/third_party/skia'] = 'got_revision' c.got_revision_reverse_mapping['got_revision'] = 'src/third_party/skia'
c.parent_got_revision_mapping['parent_got_revision'] = 'got_revision' c.parent_got_revision_mapping['parent_got_revision'] = 'got_revision'
@config_ctx(includes=['chromium']) @config_ctx(includes=['chromium'])
def chromium_webrtc(c): def chromium_webrtc(c):
c.got_revision_mapping['src/third_party/libvpx/source'] = ( c.got_revision_reverse_mapping['got_libvpx_revision'] = (
'got_libvpx_revision') 'src/third_party/libvpx/source')
@config_ctx(includes=['chromium_webrtc']) @config_ctx(includes=['chromium_webrtc'])
def chromium_webrtc_tot(c): def chromium_webrtc_tot(c):
@ -412,8 +415,10 @@ def chromium_webrtc_tot(c):
# Have the WebRTC revision appear in the web UI instead of Chromium's. # 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 # This is also important for set_component_rev to work, since got_revision
# will become a WebRTC revision instead of Chromium. # will become a WebRTC revision instead of Chromium.
c.got_revision_mapping['src'] = 'got_cr_revision' c.got_revision_reverse_mapping['got_cr_revision'] = 'src'
c.got_revision_mapping['src/third_party/webrtc'] = 'got_revision' c.got_revision_reverse_mapping['got_revision'] = 'src/third_party/webrtc'
# TODO(machenbach): Retain old behavior for now and switch in separate CL.
del c.got_revision_reverse_mapping['got_webrtc_revision']
# Needed to get the testers to properly sync the right 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_revision'] = 'got_revision'

Loading…
Cancel
Save