From 23bc51bd875d8b4f23d20d3e37026fdefaa4741a Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 14 Jun 2017 11:06:42 -0700 Subject: [PATCH] Reland of ll chromium_revision 05ba7bc226..78764cfda4 (479231:479277) (patchset #1 id:1 of https://codereview.webrtc.org/2939903002/ ) Reason for revert: The failing perf test is likely fixed in https://codereview.webrtc.org/2935263002 Original issue's description: > Revert of Roll chromium_revision 05ba7bc226..78764cfda4 (479231:479277) (patchset #1 id:1 of https://codereview.webrtc.org/2936153002/ ) > > Reason for revert: > Do not spam devs with confusing errors. > > This is caused by a chromium change that affects our android perf bots. > > Original issue's description: > > Roll chromium_revision 05ba7bc226..78764cfda4 (479231:479277) > > > > Change log: https://chromium.googlesource.com/chromium/src/+log/05ba7bc226..78764cfda4 > > Full diff: https://chromium.googlesource.com/chromium/src/+/05ba7bc226..78764cfda4 > > > > Changed dependencies: > > * src/build: https://chromium.googlesource.com/chromium/src/build/+log/4280b28b9a..6aeb18a7f5 > > * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/0dceaea435..a3fcf113d1 > > * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/02c59642df..bb1a23cc9a > > * src/third_party/gtest-parallel: https://chromium.googlesource.com/external/github.com/google/gtest-parallel/+log/886cbd9635..6fb62e80ac > > * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/d27b3e5170..0c5cd7a92e > > DEPS diff: https://chromium.googlesource.com/chromium/src/+/05ba7bc226..78764cfda4/DEPS > > > > No update to Clang. > > > > TBR= > > BUG=None > > > > Review-Url: https://codereview.webrtc.org/2936153002 > > Cr-Commit-Position: refs/heads/master@{#18581} > > Committed: https://chromium.googlesource.com/external/webrtc/+/b7d601552971992d40e84a70f936ea4e38044d91 > > TBR=buildbot@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=chromium:733108 > > Review-Url: https://codereview.webrtc.org/2939903002 > Cr-Commit-Position: refs/heads/master@{#18584} > Committed: https://chromium.googlesource.com/external/webrtc/+/58c5a7d4acd321d41baa3076dc6d5c1655b0ccbd TBR=buildbot@webrtc.org,mbonadei@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:733108 Review-Url: https://codereview.webrtc.org/2936243002 Cr-Commit-Position: refs/heads/master@{#18598} --- DEPS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 46590b37bb..8774421f0c 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '05ba7bc22678febb0eff54435aa1acca3b06878b', + 'chromium_revision': '78764cfda4e4ec4be86bd7a56d7cb7e053692b01', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -35,13 +35,13 @@ deps = { 'src/base': Var('chromium_git') + '/chromium/src/base' + '@' + '93284c507283f06eb5de3e6a1eaaba546b16a64a', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '4280b28b9a0c6f45381817098a03537b32d36fa9', + Var('chromium_git') + '/chromium/src/build' + '@' + '6aeb18a7f582ff86ca9177d95fe837e701dac2c5', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'b53a03df323e7fa7dafd892adbe70bf9f3cc97f7', 'src/testing': Var('chromium_git') + '/chromium/src/testing' + '@' + '45823c179e783fe24ee6fa249281320455935dd2', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '02c59642dfeb2b9f9baedc3d5053572232d608d1', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'bb1a23cc9ad26f8883197ca7df4ba46ff6165a2e', 'src/third_party/boringssl/src': Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), 'src/third_party/catapult': @@ -74,7 +74,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' + '@' + 'd27b3e5170f0e6477e6d0009a63bdd6c9dd31c3c', + Var('chromium_git') + '/chromium/src/tools' + '@' + '0c5cd7a92e37ecb3278be62eee098b9742639e1d', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'eb296f67da078ec01f5e3a9ea9cdc6d26d680161', 'src/tools/swarming_client': @@ -85,7 +85,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/github.com/google/gtest-parallel' + '@' + '886cbd96351ed61c198b0ff083714ec9780ed8e7', + Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '6fb62e80ac983c9965a9265ff0c474145e90354f', } deps_os = { 'android': { @@ -116,7 +116,7 @@ deps_os = { }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + '0dceaea4351d6c829a3393e933e7c4b1983d252b', + Var('chromium_git') + '/chromium/src/ios' + '@' + 'a3fcf113d1f41bfa1b94ee2a389a9bbbdbe0c54f', }, 'unix': { 'src/third_party/lss':