admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of ll chromium_revision 496a750d38..70957b2671 (447619:448581) (patchset #1 id:1 of https://codereview.webrtc.org/2680743003/ )

Browse Source 
Reason for revert:
The downstream problem should be fixed now.

Original issue's description:
> Revert of Roll chromium_revision 496a750d38..70957b2671 (447619:448581) (patchset #1 id:1 of https://codereview.webrtc.org/2683593002/ )
>
> Reason for revert:
> Breaks internal projects.
>
> Original issue's description:
> > Roll chromium_revision 496a750d38..70957b2671 (447619:448581)
> >
> > Change log: 496a750d38..70957b2671
> > Full diff: 496a750d38..70957b2671
> >
> > Changed dependencies:
> > * src/base: 32f2a4543f..3a1e5145d5
> > * src/build: 337c73855e..a5b79d9869
> > * src/ios: 6b87d69c72..533d4812cc
> > * src/testing: 04c1f97a2d..908af2e604
> > * src/third_party: c9a58f7ae6..8694363380
> > * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/358baeb9a4..3f2611a98f
> > * src/third_party/catapult: a801abb6bc..df67b47911
> > * src/third_party/gtest-parallel: 8768563f5c..e281b59a8e
> > * src/third_party/libFuzzer/src: 78ee52d0c6..64bdf91585
> > * src/tools: d4ba547dba..9491f0f1c7
> > DEPS diff: 496a750d38..70957b2671/DEPS
> >
> > No update to Clang.
> >
> > TBR=
> > BUG=None
> >
> > Review-Url: https://codereview.webrtc.org/2683593002
> > Cr-Commit-Position: refs/heads/master@{#16466}
> > Committed: 040f5cc5d7
>
> TBR=buildbot@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/2680743003
> Cr-Commit-Position: refs/heads/master@{#16468}
> Committed: f81be0a83b

TBR=buildbot@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7126

Review-Url: https://codereview.webrtc.org/2687643003
Cr-Commit-Position: refs/heads/master@{#16484}
This commit is contained in:
kjellander 2017-02-08 01:27:33 -08:00 committed by Commit bot
parent 54b6e982df
commit 76e02cd4d8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DEPS
View File

@ -2,7 +2,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': '496a750d382e5ff646318d04f85e8bcd02a48ff9',
'chromium_revision': '70957b2671edd5d21ec7b8a6cd36c0cc1f92df99',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@ -15,7 +15,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
'boringssl_revision': '358baeb9a4df81ccb916a5b8cf0ed059087645bd',
'boringssl_revision': '3f2611a98fce5c84e5e01408d2b8e18316143e84',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling nss
# and whatever else without interference from each other.
@ -27,30 +27,30 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
'catapult_revision': 'a801abb6bc4419c4d50a9c47a504a001bc1568c4',
'catapult_revision': 'df67b479111472de101150fa01307279df03f24f',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
'libfuzzer_revision': '78ee52d0c69db57fe0e984d252a991390e7d6c9b',
'libfuzzer_revision': '64bdf915852b7a8c2b81013682d77e003280168b',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
Var('chromium_git') + '/chromium/src/base' + '@' + '32f2a4543f5f61fb14d327deb9cbcb2bde1cae1b',
Var('chromium_git') + '/chromium/src/base' + '@' + '3a1e5145d54ffd6f4947e22455d770b4c54c273b',
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + '337c73855e0ac4da077f7811a19371ea34f2956b',
Var('chromium_git') + '/chromium/src/build' + '@' + 'a5b79d98694b613bb7162e993df27bcd620a333e',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'a7cc7a3e21a061975b33dcdcd81a9716ba614c3c',
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + '04c1f97a2d76a2e430b4cf1d63e0a67cd80c7587',
Var('chromium_git') + '/chromium/src/testing' + '@' + '908af2e60433e3d7b18d000ce462a989c15ddc6a',
'src/testing/gtest':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
'src/testing/gmock':
Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
'src/third_party':
Var('chromium_git') + '/chromium/src/third_party' + '@' + 'c9a58f7ae6ec543ba4acca58dbd32db050297590',
Var('chromium_git') + '/chromium/src/third_party' + '@' + '86943633802b113a93de3a789aad988878ca205a',
'src/third_party/boringssl/src':
Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'),
'src/third_party/catapult':
@ -85,7 +85,7 @@ deps = {
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a',
'src/tools':
Var('chromium_git') + '/chromium/src/tools' + '@' + 'd4ba547dba41c89e4dfdcef00491017bf39f0d60',
Var('chromium_git') + '/chromium/src/tools' + '@' + '9491f0f1c7a134a9d65b787df8d5ba160e699bee',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563',
'src/tools/swarming_client':
@ -97,7 +97,7 @@ deps = {
'src/third_party/gflags/src':
Var('chromium_git') + '/external/github.com/gflags/gflags' + '@' + '03bebcb065c83beff83d50ae025a55a4bf94dfca',
'src/third_party/gtest-parallel':
Var('chromium_git') + '/external/webrtc/deps/third_party/gtest-parallel' + '@' + '8768563f5c580f8fc416a13c35c8f23b8a602821',
Var('chromium_git') + '/external/webrtc/deps/third_party/gtest-parallel' + '@' + 'e281b59a8e04e98a4a5cacfd2e139d4d4a401d93',
}
deps_os = {
@ -125,7 +125,7 @@ deps_os = {
},
'ios': {
'src/ios':
Var('chromium_git') + '/chromium/src/ios' + '@' + '6b87d69c725f74a7d396c376cf1ace8c9f803b63',
Var('chromium_git') + '/chromium/src/ios' + '@' + '533d4812cce6bb1f9c39d5a591814ca89b64c840',
},
'unix': {
'src/third_party/lss':