Roll chromium_revision 6f7025c98c..487e5997d5 (893293:898251)

Change log: 6f7025c98c..487e5997d5
Full diff: 6f7025c98c..487e5997d5

Changed dependencies
* src/base: 39aab38bd4..375308e176
* src/build: a6379d4f30..1486ca3f44
* src/buildtools: 466954eda3..fd3f3c1998
* src/buildtools/linux64: git_revision:d2dce7523036ed7c55fbb8d2f272ab3720d5cf34..git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943
* src/buildtools/mac: git_revision:d2dce7523036ed7c55fbb8d2f272ab3720d5cf34..git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943
* src/buildtools/third_party/libc++abi/trunk: f4328ad7c0..ae0481e55f
* src/buildtools/third_party/libunwind/trunk: a38ef11ab6..ed4a85ec99
* src/buildtools/win: git_revision:d2dce7523036ed7c55fbb8d2f272ab3720d5cf34..git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943
* src/ios: 9e4ba8b69f..5d0e9c8dfd
* src/testing: 941fd54fff..aa6d8cbd3e
* src/third_party: 57d2a56d14..756cc37d55
* src/third_party/android_deps/libs/com_google_android_material_material: version:2@1.2.0-alpha06.cr0..version:2@1.4.0-rc01.cr0
* src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android: version:2@1.4.3.cr0..version:2@1.5.0.cr0
* src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm: version:2@1.4.3.cr0..version:2@1.5.0.cr0
* src/third_party/androidx: X9QRQdySUF6AfnqQBWGClKiBkrEs0dsHy1AorJ0Ekt8C..vkahwUbk9HRhzrr8mgzcH3AgAK7oO3vXVSi8NPmUpDwC
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/7fffa4636c..a10017c548
* src/third_party/breakpad/breakpad: c484031f1f..b95c4868b1
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/96bc38d7d5..e9a8ef0dd3
* src/third_party/crc32c/src: 5998f84515..fa5ade41ee
* src/third_party/depot_tools: 74ef838a40..a806594b95
* src/third_party/ffmpeg: 7e1d53a09f..05c195662f
* src/third_party/freetype/src: c6fcd61228..d3dc2da9b2
* src/third_party/google_benchmark/src: ffe1342eb2..e991355c02
* src/third_party/googletest/src: e2239ee604..4ec4cd23f4
* src/third_party/harfbuzz-ng/src: 4811e8f5d7..cc9bb29491
* src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/12287adee9..aba245dde3
* src/third_party/libunwindstack: aab2c87473..8c06e391ab
* src/third_party/libvpx/source/libvpx: 61edec1efb..eebc5cd487
* src/third_party/perfetto: d57b60b2a9..b0345c864e
* src/third_party/usrsctp/usrsctplib: 22ba62ffe7..965b19a863
* src/tools: 680815db18..d8c4d8f481
* src/tools/luci-go: git_revision:2adc53281f4a72ecb71e84a8af5acc0fced04cc9..git_revision:40f945205c8670537d14901c310374774f589254
* src/tools/luci-go: git_revision:2adc53281f4a72ecb71e84a8af5acc0fced04cc9..git_revision:40f945205c8670537d14901c310374774f589254
* src/tools/luci-go: git_revision:2adc53281f4a72ecb71e84a8af5acc0fced04cc9..git_revision:40f945205c8670537d14901c310374774f589254
Added dependencies
* src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7
* src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8
* src/third_party/android_deps/libs/com_google_android_play_core
DEPS diff: 6f7025c98c..487e5997d5/DEPS

Clang version changed llvmorg-13-init-12881-g4017d033:llvmorg-13-init-14086-ge1b8fde1
Details: 6f7025c98c..487e5997d5/tools/clang/scripts/update.py

TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,marpan@webrtc.org, jianj@chromium.org,
BUG=None

Change-Id: Ib55b600ea3713f95d013e771d5c90acd03c16523
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/224821
Reviewed-by: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Commit-Queue: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#34412}
This commit is contained in:
chromium-webrtc-autoroll 2021-07-02 11:14:07 -07:00 committed by WebRTC LUCI CQ
parent dfcc23b4e7
commit 6504fbd9d0

103
DEPS
View File

@ -10,7 +10,7 @@ vars = {
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'chromium_revision': '6f7025c98c6df9abfa129b61b865193f2f80be09',
'chromium_revision': '487e5997d59005b6cd0fc43a19764e30f7424973',
# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
@ -20,30 +20,30 @@ deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
'https://chromium.googlesource.com/chromium/src/base@39aab38bd4f39695b73376432d3763a8ad59bee2',
'https://chromium.googlesource.com/chromium/src/base@375308e1765e69953672c88732efb271fff7196e',
'src/build':
'https://chromium.googlesource.com/chromium/src/build@a6379d4f30dd17a8268e01142ceb4a76a7f7f59a',
'https://chromium.googlesource.com/chromium/src/build@1486ca3f44731ee8f227d175ef161c835b47ee16',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@466954eda391b83e90f8b925767e6152318d690b',
'https://chromium.googlesource.com/chromium/src/buildtools@fd3f3c19981cd8fe4e4f11e0a7b8fb6cf329807e',
# Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC.
'src/examples/androidtests/third_party/gradle': {
'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@f2d1fb54a951d8b11d25748e4711bec8d128d7e3',
'condition': 'checkout_android',
},
'src/ios': {
'url': 'https://chromium.googlesource.com/chromium/src/ios@9e4ba8b69f084a5e8bee79a5dbb3beebf89df8e7',
'url': 'https://chromium.googlesource.com/chromium/src/ios@5d0e9c8dfd19650bcaf7c37eaa444ec11bbd1de8',
'condition': 'checkout_ios',
},
'src/testing':
'https://chromium.googlesource.com/chromium/src/testing@941fd54fffb86923406d82cd6687df52801451ca',
'https://chromium.googlesource.com/chromium/src/testing@aa6d8cbd3e8c5ef4643829f1e2be6d34dda36b37',
'src/third_party':
'https://chromium.googlesource.com/chromium/src/third_party@57d2a56d1427d57b185d39d6bf0a1270a6979a34',
'https://chromium.googlesource.com/chromium/src/third_party@756cc37d5557d25c58c6c7831a728d3068294c59',
'src/buildtools/linux64': {
'packages': [
{
'package': 'gn/gn/linux-amd64',
'version': 'git_revision:d2dce7523036ed7c55fbb8d2f272ab3720d5cf34',
'version': 'git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943',
}
],
'dep_type': 'cipd',
@ -53,7 +53,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/mac-${{arch}}',
'version': 'git_revision:d2dce7523036ed7c55fbb8d2f272ab3720d5cf34',
'version': 'git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943',
}
],
'dep_type': 'cipd',
@ -63,7 +63,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/windows-amd64',
'version': 'git_revision:d2dce7523036ed7c55fbb8d2f272ab3720d5cf34',
'version': 'git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943',
}
],
'dep_type': 'cipd',
@ -75,9 +75,9 @@ deps = {
'src/buildtools/third_party/libc++/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@8fa87946779682841e21e2da977eccfb6cb3bded',
'src/buildtools/third_party/libc++abi/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@f4328ad7c0d8242d36cb5bea530925f9fea34248',
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@ae0481e55f1c5fba9237b6239fb47b96e69eafbd',
'src/buildtools/third_party/libunwind/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@a38ef11ab68f975bb4fe5356aff5f0e3dabe9f23',
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@ed4a85ec990bddc49cddc433efdc7cbf31246033',
'src/tools/clang/dsymutil': {
'packages': [
@ -124,22 +124,22 @@ deps = {
},
'src/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git@7fffa4636cf7647daf981914286d5d32f1beab6d',
'https://boringssl.googlesource.com/boringssl.git@a10017c548b0805eb98e7847c37370dbd37cd8d6',
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@c484031f1f199ee53567241426efffee49008f82',
'https://chromium.googlesource.com/breakpad/breakpad.git@b95c4868b10f69e642666742233aede1eb653012',
'src/third_party/catapult':
'https://chromium.googlesource.com/catapult.git@96bc38d7d5073ed80b2cb41325d07da67051f776',
'https://chromium.googlesource.com/catapult.git@e9a8ef0dd32c2ff6c14dff50f20848bfc0b2341f',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
'src/third_party/colorama/src':
'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/crc32c/src':
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@5998f8451548244de8cde7fab387a550e7c4497d',
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6',
'src/third_party/depot_tools':
'https://chromium.googlesource.com/chromium/tools/depot_tools.git@74ef838a40d8fecac485416f1a1fb07f9aeb6fd1',
'https://chromium.googlesource.com/chromium/tools/depot_tools.git@a806594b95a39141fdbf1f359087a44ffb2deaaf',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@7e1d53a09f9ae4d8909bc7d426368887342eca01',
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@05c195662f0527913811827ba253cb93758ea4c0',
'src/third_party/findbugs': {
'url': 'https://chromium.googlesource.com/chromium/deps/findbugs.git@4275d9ac8610db6b1bc9a5e887f97e41b33fac67',
'condition': 'checkout_android',
@ -150,11 +150,11 @@ deps = {
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@c6fcd61228ea349e76aa4f09442c431308da3262',
'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@d3dc2da9b27af5b90575d62989389cc65fe7977c',
'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@4811e8f5d76ef528b4cec00f241cc4ab8110db30',
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@cc9bb294919e846ef8a0731b5e9f304f95ef3bb8',
'src/third_party/google_benchmark/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20',
'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@e991355c02b93fe17713efe04cbc2e278e00fdbd',
},
# WebRTC-only dependency (not present in Chromium).
'src/third_party/gtest-parallel':
@ -170,7 +170,7 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/googletest/src':
'https://chromium.googlesource.com/external/github.com/google/googletest.git@e2239ee6043f73722e7aa812a459f54a28552929',
'https://chromium.googlesource.com/external/github.com/google/googletest.git@4ec4cd23f486bf70efcc5d2caa40f24368f752e3',
'src/third_party/icu': {
'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f',
},
@ -208,15 +208,15 @@ deps = {
'src/third_party/libsrtp':
'https://chromium.googlesource.com/chromium/deps/libsrtp.git@5b7c744eb8310250ccc534f3f86a2015b3887a0a',
'src/third_party/libaom/source/libaom':
'https://aomedia.googlesource.com/aom.git@12287adee94fc3b1f5349d3f4bd85cea4e57f62b',
'https://aomedia.googlesource.com/aom.git@aba245dde334bd51a20940eb009fa46b6ffd4511',
'src/third_party/libunwindstack': {
'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@aab2c874731396232739889ebe8d9e122b9bc448',
'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@8c06e391ab8ee01828a55477f09e7cff26182174',
'condition': 'checkout_android',
},
'src/third_party/perfetto':
'https://android.googlesource.com/platform/external/perfetto.git@d57b60b2a95fa369db906eaaeadc4623dab6eb90',
'https://android.googlesource.com/platform/external/perfetto.git@b0345c864e4a2ddeeb3b5084fb6fc7b856957ac8',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@61edec1efbea1c02d71857e2aff9426d9cd2df4e',
'https://chromium.googlesource.com/webm/libvpx.git@eebc5cd487a89c51ba148f6d6ac45779970f72d7',
'src/third_party/libyuv':
'https://chromium.googlesource.com/libyuv/libyuv.git@49ebc996aa8c4bdf89c1b5ea461eb677234c61cc',
'src/third_party/lss': {
@ -264,14 +264,14 @@ deps = {
'condition': 'checkout_android',
},
'src/third_party/usrsctp/usrsctplib':
'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@22ba62ffe79c3881581ab430368bf3764d9533eb',
'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@965b19a8636bbcd9617c1658cfe874a10cedb15d',
# Dependency used by libjpeg-turbo.
'src/third_party/yasm/binaries': {
'url': 'https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881',
'condition': 'checkout_win',
},
'src/tools':
'https://chromium.googlesource.com/chromium/src/tools@680815db180add328d56c772c251441ce3b358fa',
'https://chromium.googlesource.com/chromium/src/tools@d8c4d8f481b2734400f212658aa33655b5cfee93',
'src/tools/swarming_client':
'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
@ -372,7 +372,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/androidx',
'version': 'X9QRQdySUF6AfnqQBWGClKiBkrEs0dsHy1AorJ0Ekt8C',
'version': 'vkahwUbk9HRhzrr8mgzcH3AgAK7oO3vXVSi8NPmUpDwC',
},
],
'condition': 'checkout_android',
@ -477,15 +477,15 @@ deps = {
'packages': [
{
'package': 'infra/tools/luci/isolate/${{platform}}',
'version': 'git_revision:2adc53281f4a72ecb71e84a8af5acc0fced04cc9',
'version': 'git_revision:40f945205c8670537d14901c310374774f589254',
},
{
'package': 'infra/tools/luci/isolated/${{platform}}',
'version': 'git_revision:2adc53281f4a72ecb71e84a8af5acc0fced04cc9',
'version': 'git_revision:40f945205c8670537d14901c310374774f589254',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
'version': 'git_revision:2adc53281f4a72ecb71e84a8af5acc0fced04cc9',
'version': 'git_revision:40f945205c8670537d14901c310374774f589254',
},
],
'dep_type': 'cipd',
@ -1271,7 +1271,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material',
'version': 'version:2@1.2.0-alpha06.cr0',
'version': 'version:2@1.4.0-rc01.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_android_play_core': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core',
'version': 'version:2@1.10.0.cr0',
},
],
'condition': 'checkout_android',
@ -2114,11 +2125,33 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7',
'version': 'version:2@1.5.0.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8',
'version': 'version:2@1.5.0.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android',
'version': 'version:2@1.4.3.cr0',
'version': 'version:2@1.5.0.cr0',
},
],
'condition': 'checkout_android',
@ -2129,7 +2162,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm',
'version': 'version:2@1.4.3.cr0',
'version': 'version:2@1.5.0.cr0',
},
],
'condition': 'checkout_android',