Roll chromium_revision ef538e3112..9df92afb16 (566490:566630)
Change log: https://chromium.googlesource.com/chromium/src/+log/ef538e3112..9df92afb16
Full diff: https://chromium.googlesource.com/chromium/src/+/ef538e3112..9df92afb16
Roll chromium third_party cbc2a20101..01aaf419f6
Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/cbc2a20101..01aaf419f6
Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/02a6c4cdd0..6b48dbc0d2
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/3c4d6b6d24..169887d089
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/0c6d3816a0..b0428063aa
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/e0597e0b5d..5951b2830b
* src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/87386826a9..37a0283b18
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c7862334ce..e61dbb7de4
DEPS diff: https://chromium.googlesource.com/chromium/src/+/ef538e3112..9df92afb16/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: I5b0fde60118e7aef7929c7d33461b81078f85f93
Reviewed-on: https://webrtc-review.googlesource.com/83281
Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23589}diff --git a/DEPS b/DEPS
index e4ed3a7..c86ef30 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
- 'chromium_revision': 'ef538e3112d34f22bf36c50f71ec9c3108bda689',
+ 'chromium_revision': '9df92afb16414bb209f0e3bf5b013ddae68707f5',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@@ -43,15 +43,15 @@
# 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': 'cbc2a20101b62439635a362571b6ea68d542054c',
+ 'chromium_third_party_revision': '01aaf419f6fb93c073235564146ab7f04aaa4e62',
}
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' + '@' + '02a6c4cdd034f8d80847508e82e1391f01033017',
+ Var('chromium_git') + '/chromium/src/base' + '@' + '6b48dbc0d2049352237d96e164827733276ff0be',
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '3c4d6b6d24da4fda0c55f2cff4dd9f542fbfdd43',
+ Var('chromium_git') + '/chromium/src/build' + '@' + '169887d089f363d4ee7349c0753521437c7244e3',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '6f4dae280c6a542acacd8db281decc5c0b2a9823',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@@ -61,11 +61,11 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '0c6d3816a06717b42104f4d59f5b525c95e8ac97',
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'b0428063aa70683e8ccc17098090e51ab09a5e05',
'condition': 'checkout_ios',
},
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + 'e0597e0b5d0d6d2b146bf1738347ca6bcb6613cd',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + '5951b2830bb7c356e6c7c2524a16efcd211d7286',
# 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 @@
'src/third_party/libsrtp':
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'fc2345089a6b3c5aca9ecd2e1941871a78a13e9c',
'src/third_party/libvpx/source/libvpx':
- Var('chromium_git') + '/webm/libvpx.git' + '@' + '87386826a95fda953162050a27f2506d8c1f3db5',
+ Var('chromium_git') + '/webm/libvpx.git' + '@' + '37a0283b18a12b60e28050ea05682e5a39f0ec9e',
'src/third_party/libyuv':
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '196e2e72a3190f539d5ad5f32c7b154154324951',
'src/third_party/lss': {
@@ -185,7 +185,7 @@
'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' + '@' + 'c7862334ce4a9647355f622299799ef0554daf6f',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + 'e61dbb7de4535e8928f7c65cffdfae5ebe1ef470',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':
diff --git a/third_party/libvpx/README.chromium b/third_party/libvpx/README.chromium
index cfdffa8..2675a35 100644
--- a/third_party/libvpx/README.chromium
+++ b/third_party/libvpx/README.chromium
@@ -5,9 +5,9 @@
License File: source/libvpx/LICENSE
Security Critical: yes
-Date: Tuesday June 05 2018
+Date: Tuesday June 12 2018
Branch: master
-Commit: 87386826a95fda953162050a27f2506d8c1f3db5
+Commit: 37a0283b18a12b60e28050ea05682e5a39f0ec9e
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and
diff --git a/third_party/libvpx/source/config/vpx_version.h b/third_party/libvpx/source/config/vpx_version.h
index afe72b1..9fb2a13 100644
--- a/third_party/libvpx/source/config/vpx_version.h
+++ b/third_party/libvpx/source/config/vpx_version.h
@@ -2,7 +2,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 7
#define VERSION_PATCH 0
-#define VERSION_EXTRA "435-g87386826a"
+#define VERSION_EXTRA "465-g37a0283b1"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.7.0-435-g87386826a"
-#define VERSION_STRING " v1.7.0-435-g87386826a"
+#define VERSION_STRING_NOSP "v1.7.0-465-g37a0283b1"
+#define VERSION_STRING " v1.7.0-465-g37a0283b1"
