Add missing `src/third_party/jdk11` dependency and roll chromium into webrtc
Roll chromium_revision e5191e93ab..1f33300013 (1096792:1097480)
Change log: https://chromium.googlesource.com/chromium/src/+log/e5191e93ab..1f33300013
Full diff: https://chromium.googlesource.com/chromium/src/+/e5191e93ab..1f33300013
Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/451505f0f1..211595b9e1
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/1a2bf3bafa..8e59fa7328
* src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/0cc02fb849..3c7e3f1b8b
* src/buildtools/third_party/libc++/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/1dfd0022c4..1127c78cf9
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/5c6f9398b9..c44e3b09fa
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/3bec4d3b1c..89218c737f
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/c16ccdd4ad..97f83ef911
* src/third_party/androidx: 3nXDIlFQ-oAo4egDVeC0GbueTl4mOfPrEDzT5jgDEK8C..8KUWsjmvRQJlzdaro14SgP8nok3-kHY2h00BEjXLJqQC
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/45986b07fa..abaad53f0c
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/c710e2d56a..44e9bee34f
* src/third_party/jdk: egbcSHbmF1XZQbKxp_PQiGLFWlQK65krTGqQE-Bj4j8C..-FR8HTNcMfxy7J2HUaWVa0QmEE4f68iotzvFbqOj2LEC
* src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/ee03e391a1..7706133c5b
* src/third_party/r8: SCuPfdKTpEJfVbWzckpmWx125Zf3pO-4RitqcfXX-RQC..lhnuNLpWpWBVM6efX0iIg5i9ztfW8VKpMvkyfWCxfr0C
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/7c53822d54..8a2826d35f
* src/tools/luci-go: git_revision:36cf4b54527c49aca7ed3023995a081e14f1852a..git_revision:221383f749a2c5b8587449d3d2e4982857daa9e7
* src/tools/luci-go: git_revision:36cf4b54527c49aca7ed3023995a081e14f1852a..git_revision:221383f749a2c5b8587449d3d2e4982857daa9e7
DEPS diff: https://chromium.googlesource.com/chromium/src/+/e5191e93ab..1f33300013/DEPS
No update to Clang.
BUG=b/266775646
Change-Id: I2597b77b4c3d29d88674825aa7e241f2be0a8820
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291436
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39210}
diff --git a/DEPS b/DEPS
index f8652c2..737e836 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
- 'chromium_revision': 'e5191e93ab8c1891c6b06f7321e68220b1afff84',
+ 'chromium_revision': '1f33300013ce5635fff5d4689a34610b45ca1ca8',
# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
@@ -41,24 +41,24 @@
deps = {
# TODO(kjellander): Move this to be Android-only.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@451505f0f1850738326d8bba14544b8e6ac3f17c',
+ 'https://chromium.googlesource.com/chromium/src/base@211595b9e135e9641b8a36aa019b0bd14c10ad69',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@1a2bf3bafad5f0a48a9fe21c2aab0ab98d8a47d9',
+ 'https://chromium.googlesource.com/chromium/src/build@8e59fa732818499c2555d91b8eaa4d36f9d3066c',
'src/buildtools':
- 'https://chromium.googlesource.com/chromium/src/buildtools@0cc02fb849280c9adf6aa939e35ec03636bed5b1',
+ 'https://chromium.googlesource.com/chromium/src/buildtools@3c7e3f1b8b1e4c0b6ec693430379cea682de78d6',
# 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@5c6f9398b9636fe90405654f0079dfe0027bbf02',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@c44e3b09fae748aeb89901468217d3446a6f6531',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@3bec4d3b1cad9663a56ea372b7de6fa6426faca2',
+ 'https://chromium.googlesource.com/chromium/src/testing@89218c737f642fd7db52c69a54e9b7ceebafb5f5',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@c16ccdd4ad5c36445fea01da4f71feee5f1b3f33',
+ 'https://chromium.googlesource.com/chromium/src/third_party@97f83ef91157484886369816b0ee62ec99d7b6b1',
'src/buildtools/linux64': {
'packages': [
@@ -106,7 +106,7 @@
'src/buildtools/clang_format/script':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@f97059df7f8b205064625cdb5f97b56668a125ef',
'src/buildtools/third_party/libc++/trunk':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@1dfd0022c4d7aa370a8572d4710558ff8684d7a3',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@1127c78cf90cf253be614a1e1d3645da57edbeb4',
'src/buildtools/third_party/libc++abi/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@d520d582aa710cc0a4635620c02c5dbc187deb4f',
'src/buildtools/third_party/libunwind/trunk':
@@ -169,7 +169,7 @@
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@79326ebe9446add03e76b4422ff8036e812224d2',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@45986b07facfe4cde512b52897ae413617896cc0',
+ 'https://chromium.googlesource.com/catapult.git@abaad53f0c4e104ab630b314af2902ad83b82c8c',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -178,7 +178,7 @@
'src/third_party/crc32c/src':
'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@c710e2d56a813d27d2368eb0e7e292bd2f59519f',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@44e9bee34fcc7e8dedc2a988750c9d7cc7f73eba',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@a249b21db6516234e5456716ae074fbb00176b3f',
'src/third_party/flatbuffers/src':
@@ -220,12 +220,25 @@
'packages': [
{
'package': 'chromium/third_party/jdk',
- 'version': 'egbcSHbmF1XZQbKxp_PQiGLFWlQK65krTGqQE-Bj4j8C',
+ 'version': '-FR8HTNcMfxy7J2HUaWVa0QmEE4f68iotzvFbqOj2LEC',
},
],
'condition': 'host_os == "linux" and checkout_android',
'dep_type': 'cipd',
},
+ # Deprecated - only use for tools which are broken real JDK.
+ # Not used by WebRTC. Added for compatibility with Chromium.
+ 'src/third_party/jdk11': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/jdk',
+ # Do not update this hash - any newer hash will point to JDK17+.
+ 'version': 'egbcSHbmF1XZQbKxp_PQiGLFWlQK65krTGqQE-Bj4j8C',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
'src/third_party/jsoncpp/source':
'https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@42e892d96e47b1f6e29844cc705e148ec4856448', # from svn 248
'src/third_party/junit/src': {
@@ -248,7 +261,7 @@
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@ee03e391a1003e8cdc7ce7e07f14b6872883fd1c',
+ 'https://android.googlesource.com/platform/external/perfetto.git@7706133c5b028b83ce0cf64ce340ebbf757305e4',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@b7c22b3a9584d7d9c0a7b9b37a52bc595113b398',
'src/third_party/libyuv':
@@ -273,7 +286,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'SCuPfdKTpEJfVbWzckpmWx125Zf3pO-4RitqcfXX-RQC',
+ 'version': 'lhnuNLpWpWBVM6efX0iIg5i9ztfW8VKpMvkyfWCxfr0C',
},
],
'condition': 'checkout_android',
@@ -297,7 +310,7 @@
'condition': 'checkout_android',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@7c53822d54407baaf8092640fcaf8af8a58e3ae4',
+ 'https://chromium.googlesource.com/chromium/src/tools@8a2826d35ffc957efb5d5aa00d72daa615ea6c88',
'src/third_party/accessibility_test_framework': {
'packages': [
@@ -374,7 +387,7 @@
'packages': [
{
'package': 'chromium/third_party/androidx',
- 'version': '3nXDIlFQ-oAo4egDVeC0GbueTl4mOfPrEDzT5jgDEK8C',
+ 'version': '8KUWsjmvRQJlzdaro14SgP8nok3-kHY2h00BEjXLJqQC',
},
],
'condition': 'checkout_android',
@@ -486,11 +499,11 @@
'packages': [
{
'package': 'infra/tools/luci/isolate/${{platform}}',
- 'version': 'git_revision:36cf4b54527c49aca7ed3023995a081e14f1852a',
+ 'version': 'git_revision:221383f749a2c5b8587449d3d2e4982857daa9e7',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
- 'version': 'git_revision:36cf4b54527c49aca7ed3023995a081e14f1852a',
+ 'version': 'git_revision:221383f749a2c5b8587449d3d2e4982857daa9e7',
},
],
'dep_type': 'cipd',
