From 851481cfaadfd758119396e6403aaefb13be6d7d Mon Sep 17 00:00:00 2001 From: Charu Jain Date: Wed, 20 Sep 2017 09:36:38 +0000 Subject: [PATCH] Revert "Roll chromium_revision f52ff80530..4bafa509ea (501932:502960)" This reverts commit e68293553d1bd2504bf3ebf7f6769c3b01e640e3. Reason for revert: Breaks internal projects Original change's description: > Roll chromium_revision f52ff80530..4bafa509ea (501932:502960) > > Change log: https://chromium.googlesource.com/chromium/src/+log/f52ff80530..4bafa509ea > Full diff: https://chromium.googlesource.com/chromium/src/+/f52ff80530..4bafa509ea > > Changed dependencies: > * src/base: https://chromium.googlesource.com/chromium/src/base/+log/a3848e11ae..6afcd86a32 > * src/build: https://chromium.googlesource.com/chromium/src/build/+log/0119b14e14..67a664871e > * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/cbc33b9c0a..26b7e66950 > * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/79eaa19c53..2cd231262b > * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/e9068583fe..0c3fb670c3 > * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/3c251d88b3..f56e199ae6 > * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/683ffbbe57..f51f273ee8 > * src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/dd30f4f383..ab30bb20a8 > * src/third_party/gtest-parallel: https://chromium.googlesource.com/external/github.com/google/gtest-parallel/+log/965cfdccf9..ee20273811 > * src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/27036e33e8..5b1af9a335 > * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/02f1273b3b..4fa8837ea2 > DEPS diff: https://chromium.googlesource.com/chromium/src/+/f52ff80530..4bafa509ea/DEPS > > Clang version changed 312679:313222 > Details: https://chromium.googlesource.com/chromium/src/+/f52ff80530..4bafa509ea/tools/clang/scripts/update.py > > TBR=buildbot@webrtc.org, > BUG=None > CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal > > Change-Id: Iade6f94aca4b9d61cf545e80147268bbab5ee3ed > Reviewed-on: https://webrtc-review.googlesource.com/2280 > Commit-Queue: WebRTC Buildbot > Reviewed-by: WebRTC Buildbot > Cr-Commit-Position: refs/heads/master@{#19904} TBR=buildbot@webrtc.org Change-Id: I358e1006a0f2708bb106eb8ee81118c3c8702fb4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: None Cq-Include-Trybots: master.internal.tryserver.corp.webrtc:linux_internal Reviewed-on: https://webrtc-review.googlesource.com/2320 Reviewed-by: Charu Jain Commit-Queue: Charu Jain Cr-Commit-Position: refs/heads/master@{#19905} --- DEPS | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/DEPS b/DEPS index 0ca393bc45..1fba17f65a 100644 --- a/DEPS +++ b/DEPS @@ -3,7 +3,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', 'webrtc_git': 'https://webrtc.googlesource.com', - 'chromium_revision': '4bafa509eae1b67c6655bc9ace292d0953225f99', + 'chromium_revision': 'f52ff8053016c717f40291d9a3866d918be1ed0d', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -16,7 +16,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': 'f51f273ee8eb67e1b2b36bb9ef576bd8ff8632bc', + 'boringssl_revision': '683ffbbe57de2163b24993e0d03650cf393bc640', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss # and whatever else without interference from each other. @@ -24,7 +24,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': 'ab30bb20a857ea0136d8bf5ae449ef2b58690658', + 'catapult_revision': 'dd30f4f3837eee42feb07e49dd02c8777b700fb2', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -34,15 +34,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' + '@' + '6afcd86a32f30cfe3ca6df26290f9caed64656ac', + Var('chromium_git') + '/chromium/src/base' + '@' + 'a3848e11aef59bb2d13bc7ab1089c9381a3a0299', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '67a664871e06413726c3f49252a862ae9c851ecf', + Var('chromium_git') + '/chromium/src/build' + '@' + '0119b14e142eac97d4c08ec0051681cb719db99b', 'src/buildtools': - Var('chromium_git') + '/chromium/buildtools.git' + '@' + '26b7e66950e910d7cdd4c3faf780cca25a5ce39a', + Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'cbc33b9c0a9d1bb913895a4319a742c504a2d541', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '0c3fb670c3e4a05e6159d44f952124a6921b2dee', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'e9068583fee90859b7851892e7d308cfe7546d3d', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'f56e199ae69d354b055547ff847fc844e8ec2f16', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '3c251d88b392d32b2827b10b74091f535a95f785', 'src/third_party/boringssl/src': Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), 'src/third_party/catapult': @@ -67,7 +67,7 @@ deps = { 'src/third_party/libvpx/source/libvpx': Var('chromium_git') + '/webm/libvpx.git' + '@' + '9a2dd7e67ed20a7389db618f1a8a25d5b3a3c89c', 'src/third_party/libyuv': - Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '5b1af9a33545895ea12c52bf007f17914de19173', + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '27036e33e86c9ce3b5087d55c18bf04964343c60', 'src/third_party/openh264/src': Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '0fd88df93c5dcaf858c57eb7892bd27763f0f0ac', 'src/third_party/openmax_dl': @@ -77,7 +77,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '4fa8837ea2aa02df2d14bcd8eb4f42d79d6e79ee', + Var('chromium_git') + '/chromium/src/tools' + '@' + '02f1273b3b372d36d7bdc95d6aab80a552a661e3', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': @@ -88,7 +88,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' + '@' + 'ee2027381105650fb1c66b2b121ba00b79e84d5c', + Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '965cfdccf9d9aeb78b2a78ea918a77d95f3a7868', } deps_os = { 'android': { @@ -119,7 +119,7 @@ deps_os = { }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + '2cd231262b50ebeae96640ea1c0a018febbc4ed4', + Var('chromium_git') + '/chromium/src/ios' + '@' + '79eaa19c53821332945e79b10da372ae7845bf3e', }, 'unix': { 'src/third_party/lss':