zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision eb7233cee8..577ba36372 (562409:562638)

Browse Source 
Change log: eb7233cee8..577ba36372
Full diff: eb7233cee8..577ba36372

Roll chromium third_party 964479cf94..9f9dc42c89
Change log: 964479cf94..9f9dc42c89

Changed dependencies:
* src/base: 60caf964a3..c4070f6ece
* src/build: 25be5e8c8e..10a93c2ce7
* src/ios: e05d522249..0fe6b1881d
* src/testing: c23170bef6..802a878061
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/0043a4a254..46ef7c475a
* src/third_party/libvpx/source/libvpx: 36825590ba..2b08f89076
* src/tools: 9077464195..dd9a557d94
DEPS diff: eb7233cee8..577ba36372/DEPS

No update to Clang.

TBR=buildbot@webrtc.org,marpan@webrtc.org,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
NO_AUTOIMPORT_DEPS_CHECK=true

Change-Id: Ifc927ee27578db13bc333ebc338095cf031e5d9c
Reviewed-on: https://webrtc-review.googlesource.com/79740
Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23437}
This commit is contained in:
Autoroller
2018-05-29 15:47:52 -07:00
committed by Commit Bot
parent 183f4d90bd
commit a20faf243a
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DEPS
View File

@ -10,7 +10,7 @@ vars = {
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': 'eb7233cee8436ea524be3eb000e21c54c1c64f69',
'chromium_revision': '577ba3637231998f5f807afce564d7f417e7c2aa',
'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': '0043a4a254625989ff29785bda17ec83b5bde51a',
'catapult_revision': '46ef7c475a9293a54d77b76a29fa7f2f2be95bcb',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
@ -43,15 +43,15 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Chromium third_party
# and whatever else without interference from each other.
'chromium_third_party_revision': '964479cf9407b632a1f99af98382eea3d749173b',
'chromium_third_party_revision': '9f9dc42c892eb96b4fb7dd2e46ff0cd9dac521df',
}
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' + '@' + '60caf964a31a0c0850372a2e421485f0c783c32c',
Var('chromium_git') + '/chromium/src/base' + '@' + 'c4070f6ece95445ed53319860d2e35e3b2b57434',
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + '25be5e8c8e4bfc814c6ad19b7e9ff8bd8f44a563',
Var('chromium_git') + '/chromium/src/build' + '@' + '10a93c2ce7360864b59aecfed4c6b8608cd2f0cc',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '893eb86b02b2571894e328f05551112b96df1cce',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@ -61,11 +61,11 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'e05d522249d3a9648341e7492ff133c96c5e1398',
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '0fe6b1881d466cdbfece4c9eea1ff726b663f897',
'condition': 'checkout_ios',
},
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + 'c23170bef6bfb427056071e71573cf09a3a9991a',
Var('chromium_git') + '/chromium/src/testing' + '@' + '802a87806100a74f60af081c79c0e006bc7036e8',
# This entry is used for chromium third_party rolling into webrtc third_party only.
'src/third_party_chromium': {
'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'),
@ -135,7 +135,7 @@ deps = {
'src/third_party/libsrtp':
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'fc2345089a6b3c5aca9ecd2e1941871a78a13e9c',
'src/third_party/libvpx/source/libvpx':
Var('chromium_git') + '/webm/libvpx.git' + '@' + '36825590ba676d54765c6c31482cacb4fe661b43',
Var('chromium_git') + '/webm/libvpx.git' + '@' + '2b08f89076d1e93339fbbcc10e3298a0eec66bd6',
'src/third_party/libyuv':
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + 'a9626b9daf62a9b260737e9c2de821ad087b19a1',
'src/third_party/lss': {
@ -175,7 +175,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' + '@' + '907746419506e2c9cbe6ae07eaf6c46779a97616',
Var('chromium_git') + '/chromium/src/tools' + '@' + 'dd9a557d94ea7d59ac67807dcd37b28a3b7f77f3',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':

4
third_party/libvpx/README.chromium vendored
View File

@ -5,9 +5,9 @@ License: BSD
License File: source/libvpx/LICENSE
Security Critical: yes
Date: Friday May 25 2018
Date: Monday May 28 2018
Branch: master
Commit: 36825590ba676d54765c6c31482cacb4fe661b43
Commit: 2b08f89076d1e93339fbbcc10e3298a0eec66bd6
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and

6
third_party/libvpx/source/config/vpx_version.h vendored
View File

@ -2,7 +2,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 7
#define VERSION_PATCH 0
#define VERSION_EXTRA "400-g36825590b"
#define VERSION_EXTRA "404-g2b08f8907"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.7.0-400-g36825590b"
#define VERSION_STRING " v1.7.0-400-g36825590b"
#define VERSION_STRING_NOSP "v1.7.0-404-g2b08f8907"
#define VERSION_STRING " v1.7.0-404-g2b08f8907"