From cd9dd458d0550acd646a2eb5c80130ff061d53cc Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 28 Jun 2017 01:23:23 -0700 Subject: [PATCH] Revert of Roll chromium_revision 1b96d497c1..6e26093ba6 (482761:482873) (patchset #1 id:1 of https://codereview.webrtc.org/2961953002/ ) Reason for revert: The reason for reverting is: Breaks internal project. Previous roll was already reverted in https://codereview.webrtc.org/2957243002 but the autoroller wasn't halted so this was relanded here.. Original issue's description: > Roll chromium_revision 1b96d497c1..6e26093ba6 (482761:482873) > > Change log: https://chromium.googlesource.com/chromium/src/+log/1b96d497c1..6e26093ba6 > Full diff: https://chromium.googlesource.com/chromium/src/+/1b96d497c1..6e26093ba6 > > Changed dependencies: > * src/base: https://chromium.googlesource.com/chromium/src/base/+log/f8bde9c273..9112182a54 > * src/build: https://chromium.googlesource.com/chromium/src/build/+log/d1d51d3325..ca3fb287a5 > * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/c7dda527c5..ca97ab62d4 > * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/5b41a1d1ad..a546983908 > * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/15594769ca..90317046fa > * src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/bdff8501d7..aff474911e > * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/44e2f6ae79..d239f484b2 > DEPS diff: https://chromium.googlesource.com/chromium/src/+/1b96d497c1..6e26093ba6/DEPS > > No update to Clang. > > TBR= > BUG=None > > Review-Url: https://codereview.webrtc.org/2961953002 > Cr-Commit-Position: refs/heads/master@{#18796} > Committed: https://chromium.googlesource.com/external/webrtc/+/8a671751fce86b29cd91f105485ccb86921722b2 TBR=buildbot@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=b/63085354 Review-Url: https://codereview.webrtc.org/2962833002 Cr-Commit-Position: refs/heads/master@{#18802} --- DEPS | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 697cbf82f8..fc2ca682d5 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '6e26093ba629b7aa843f7284c8751d1f752f4b1e', + 'chromium_revision': '1b96d497c1ad96d0f546f46a9277434defadbddd', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -23,7 +23,7 @@ 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': 'aff474911e21bccfa564c08712b13f4cd3ad75ba', + 'catapult_revision': 'bdff8501d71be9e9e710f3effa09a5c3a7acaa6a', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -33,15 +33,15 @@ 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' + '@' + '9112182a546c753dc0389e8000ff0b5c66454a51', + Var('chromium_git') + '/chromium/src/base' + '@' + 'f8bde9c2733e44b612014fcb822ac6307ecd674b', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'ca3fb287a59ee1fd899838d29f8704ced5b18da4', + Var('chromium_git') + '/chromium/src/build' + '@' + 'd1d51d33251fba7c5d4c95d78df0a479039832ea', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '1dcd1bdbe93467531a50b60dbd18860803ca7be1', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + 'a546983908dddd33927eea201c97f734237facb0', + Var('chromium_git') + '/chromium/src/testing' + '@' + '5b41a1d1add2f8e99391826ba2d8a635341c8904', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '90317046fa4cabd5bde896596de0a7f43bf7a0fb', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '15594769ca4a6b46c5d104a5175b3e5afc92df59', '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' + '@' + 'd239f484b2cf759efcc494a81f4f61065ee73673', + Var('chromium_git') + '/chromium/src/tools' + '@' + '44e2f6ae792b7a122fd17f125e148b53502e5f81', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'eb296f67da078ec01f5e3a9ea9cdc6d26d680161', 'src/tools/swarming_client': @@ -116,7 +116,7 @@ deps_os = { }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + 'ca97ab62d4c4ddd3bc759eec503391ae74713203', + Var('chromium_git') + '/chromium/src/ios' + '@' + 'c7dda527c50f42ea196e08f5eda0c56de44c1248', }, 'unix': { 'src/third_party/lss':