From 24d1c6162ee9d623ba1098968ccba986625173e3 Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 14 Feb 2017 05:00:01 -0800 Subject: [PATCH] Revert of chromium_revision 7a8b621535..962dfbcdb2 (449940:450031) (patchset #1 id:1 of https://codereview.webrtc.org/2690183005/ ) Reason for revert: Downstream fix needs to wait, so revert again to green up. Original issue's description: > Reland of Roll chromium_revision 7a8b621535..962dfbcdb2 (449940:450031) (patchset #1 id:1 of https://codereview.webrtc.org/2690243002/ ) > > Reason for revert: > I have a fix ready for the downstream project. > > Original issue's description: > > Revert of Roll chromium_revision 7a8b621535..962dfbcdb2 (449940:450031) (patchset #1 id:1 of https://codereview.webrtc.org/2694773003/ ) > > > > Reason for revert: > > The libvpx roll broke an internal project > > > > Original issue's description: > > > Roll chromium_revision 7a8b621535..962dfbcdb2 (449940:450031) > > > > > > Change log: https://chromium.googlesource.com/chromium/src/+log/7a8b621535..962dfbcdb2 > > > Full diff: https://chromium.googlesource.com/chromium/src/+/7a8b621535..962dfbcdb2 > > > > > > Changed dependencies: > > > * src/base: https://chromium.googlesource.com/chromium/src/base/+log/da9ea7c196..e7ee554267 > > > * src/build: https://chromium.googlesource.com/chromium/src/build/+log/3e5cfce8cf..11f5df6e25 > > > * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/aef3d8defa..ba6815a36f > > > * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/a2296b7dbc..26d563eb01 > > > * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/164db8278f..91f87e7513 > > > * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/8bbd3624b9..aceeebe907 > > > DEPS diff: https://chromium.googlesource.com/chromium/src/+/7a8b621535..962dfbcdb2/DEPS > > > > > > No update to Clang. > > > > > > TBR=marpan@webrtc.org, > > > BUG=None > > > > > > Review-Url: https://codereview.webrtc.org/2694773003 > > > Cr-Commit-Position: refs/heads/master@{#16590} > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9c9d95b2dcf6007de99ad640e2f0f48e69dcb9db > > > > TBR=marpan@webrtc.org,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/2690243002 > > Cr-Commit-Position: refs/heads/master@{#16592} > > Committed: https://chromium.googlesource.com/external/webrtc/+/02c739f4ef9735fb1453a2499e74c24f3cea4453 > > TBR=marpan@webrtc.org,buildbot@webrtc.org,kjellander@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/2690183005 > Cr-Commit-Position: refs/heads/master@{#16600} > Committed: https://chromium.googlesource.com/external/webrtc/+/29ea2edfe6b54d9a3bbe9b79932a4a72a906e350 TBR=marpan@webrtc.org,buildbot@webrtc.org,peah@webrtc.org,kjellander@google.com # 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/2691933005 Cr-Commit-Position: refs/heads/master@{#16610} --- DEPS | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/DEPS b/DEPS index b2f7aa65f9..074c593539 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'd80d672c08a421739a5ecd80c6e9bc2cfc745946', + 'chromium_revision': '7a8b621535abb3aa5d9c0ff2196299f1d90449a5', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -27,7 +27,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': '79fa79eb4b20030861f9c1f327194976e6c7f7a6', + 'catapult_revision': '6fa9f83f7490d8d12e32e1386cd1fd8e08462e47', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -38,19 +38,19 @@ 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' + '@' + '0b38c57bf363c9fc17602e1cd3ee1b4e0771629d', + Var('chromium_git') + '/chromium/src/base' + '@' + 'da9ea7c196dc98fa14cb6b24c7290f3b6b4061b3', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'a5d37780d43623aaddfb359d2e079d3f81b27373', + Var('chromium_git') + '/chromium/src/build' + '@' + '3e5cfce8cf9eb4274e5e3f71ded1649bd5d5995a', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'a7cc7a3e21a061975b33dcdcd81a9716ba614c3c', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '65367d41a489c5277a4986bf5e1b46cea638918f', + Var('chromium_git') + '/chromium/src/testing' + '@' + '71872f7d7065f45ee3db0fe6f03239e1081a1e3d', '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' + '@' + '66cd1bd6e43efb07f76c8203afe2acc40babfb57', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'a2296b7dbc87da677caebcd1887ce11204be8b51', 'src/third_party/boringssl/src': Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), 'src/third_party/catapult': @@ -58,7 +58,7 @@ deps = { 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/ffmpeg': - Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '38d84d205cd89cb9ce740735d2d31d4bc2a07abb', + Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'a77cdbfeb7b629eb3a5012d7c6c94ef11e0488be', 'src/third_party/jsoncpp/source': Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248 @@ -71,7 +71,7 @@ deps = { 'src/third_party/libsrtp': Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '0e0936f3013fe5884eac82f95e370c8d460a179f', 'src/third_party/libvpx/source/libvpx': - Var('chromium_git') + '/webm/libvpx.git' + '@' + '91f87e75135cc9722ee72daf5154424f628a906e', + Var('chromium_git') + '/webm/libvpx.git' + '@' + '164db8278f68a5ab376500ed6aad99ef7da3e9b0', 'src/third_party/libyuv': Var('chromium_git') + '/libyuv/libyuv.git' + '@' + 'b18fd21d3c27fce69b5c1ed44b89131dedc87284', 'src/third_party/nss': @@ -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' + '@' + 'f35c039ee17dcc3426cfca4711b25b0df18063f0', + Var('chromium_git') + '/chromium/src/tools' + '@' + '8bbd3624b97857d38be0169dc6e251a26502b00a', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563', 'src/tools/swarming_client': @@ -125,7 +125,7 @@ deps_os = { }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + 'df8916d4663879cfeb2d1c21d165365907d3076d', + Var('chromium_git') + '/chromium/src/ios' + '@' + 'aef3d8defa53e9e23871358de558051738a4ec7b', }, 'unix': { 'src/third_party/lss':