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

Revert "Roll chromium_revision 3d1e7a12b7..8b6898fe4e (517813:518117)"

Browse Source 
This reverts commit 12325c5b83d46e5114ce27c7db97ab5e8ab08ff9.

Reason for revert: It breaks win32_asan.

Original change's description:
> Roll chromium_revision 3d1e7a12b7..8b6898fe4e (517813:518117)
> 
> Change log: 3d1e7a12b7..8b6898fe4e
> Full diff: 3d1e7a12b7..8b6898fe4e
> 
> Changed dependencies:
> * src/base: 4c3d6272f8..b2b46604dd
> * src/build: 571871636f..6167734e03
> * src/ios: 865de15eaf..d6ba2ebe6e
> * src/testing: 14acaa118c..c5ed5cc935
> * src/third_party: d43ee09615..de6ce59aae
> * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/6cc352e216..8793942c5c
> * src/third_party/depot_tools: ddfead3483..7227d2175a
> * src/third_party/ffmpeg: 252244150a..168dfaa19b
> * src/tools: bce4039f1c..2c0f60c1ad
> DEPS diff: 3d1e7a12b7..8b6898fe4e/DEPS
> 
> No update to Clang.
> 
> TBR=buildbot@webrtc.org,
> BUG=None
> CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
> 
> Change-Id: I7115e7c9e4bc14b1fbe46554413d9f45954a590c
> Reviewed-on: https://webrtc-review.googlesource.com/24760
> Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
> Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20807}

TBR=buildbot@webrtc.org

Change-Id: I143941a4977c177ad1819ed8d2c12d05fe3c37d5
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/24840
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20808}
This commit is contained in:
Mirko Bonadei 2017-11-21 10:40:37 +00:00 committed by Commit Bot
parent 12325c5b83
commit 212ad82494
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DEPS
View File

@ -7,7 +7,7 @@ vars = {
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': '8b6898fe4eaa9131b35f2e9d72af0fa1fcccccf0',
'chromium_revision': '3d1e7a12b7be5570883f9b92871d9facd4c8138d',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@ -20,7 +20,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': '8793942c5c7f4a46dcadea3a686c50f2b1c312ed',
'boringssl_revision': '6cc352e216938d78b65fb8ccbeebfc1f7f7486c4',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lss
# and whatever else without interference from each other.
@ -38,9 +38,9 @@ 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' + '@' + 'b2b46604dd911da5544bb571d21f771192f11475',
Var('chromium_git') + '/chromium/src/base' + '@' + '4c3d6272f834cc5982c9ff76d9e120a12d0cac3c',
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + '6167734e03a9644bf0f9f3c8ca1f516659d311ae',
Var('chromium_git') + '/chromium/src/build' + '@' + '571871636f333d4ecf5583eb6cd205fedf3bfdf7',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '461b345a815c1c745ac0534a6a4bd52d123abe68',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@ -50,13 +50,13 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'd6ba2ebe6e30c370a397b6ee582ab0ef4a0cfe8a',
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '865de15eaf836778090fabe7eff667d2f85423f5',
'condition': 'checkout_ios',
},
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + 'c5ed5cc9359bdb879f7c66c9843c853443b7fd23',
Var('chromium_git') + '/chromium/src/testing' + '@' + '14acaa118cfb712cd3ffc6de40646fb3498d631f',
'src/third_party':
Var('chromium_git') + '/chromium/src/third_party' + '@' + 'de6ce59aae370c0b77480d86367a93f9ca695876',
Var('chromium_git') + '/chromium/src/third_party' + '@' + 'd43ee09615faa1f90a0768d9742ccb15e425d0c0',
'src/third_party/android_tools': {
'url': Var('chromium_git') + '/android_tools.git' + '@' + '9914c5704717424998c69e837be3631914d787cc',
'condition': 'checkout_android',
@ -76,13 +76,13 @@ deps = {
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '7227d2175a9efdf5c1b9482e6fae0e5e5b00b3de',
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'ddfead3483f2c1b49419de2b9f561cb32763f2b3',
'src/third_party/errorprone/lib': {
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '635c410fc42614b48518ae6818105bc83af88497',
'condition': 'checkout_android',
},
'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '168dfaa19bfdaa60e58a675eea67d2ee700fcdf9',
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '252244150ad759fe86470f40642514bf2a7aec98',
'src/third_party/findbugs': {
'url': Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '4275d9ac8610db6b1bc9a5e887f97e41b33fac67',
'condition': 'checkout_android',
@ -155,7 +155,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' + '@' + '2c0f60c1adfd09c9a1bc62408bc16867cd720023',
Var('chromium_git') + '/chromium/src/tools' + '@' + 'bce4039f1c4c202ac662e7527768ecb06537a3b6',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':