Roll Chromium DEPS manually.
Because the packages list changed, the roll_chromium_deps script
was failing. Manually roll and update the failure assertion to
make the required action clear.
Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/488aac0b88..2ef6eae721
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/8c3404999d..b8e44ff539
* third_party/abseil-cpp: https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp/+log/9211d9e376..368be24f93
* third_party/android_deps: https://chromium.googlesource.com/chromium/src/third_party/android_deps/+log/0ab40df9d1..12d2cf1a46
* third_party/android_sdk: https://chromium.googlesource.com/chromium/src/third_party/android_sdk/+log/76bd51b56b..ff9352c23f
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..10f6e4b89b
* third_party/r8: Nu_mvQJe34CotIXadFlA3w732CJ9EvQGuVs4udcZedAC..gXyBDv_fM87KnLcxvF5AGV5lwnm-JXIALYH8zrzdoaMC
* tools/luci-go: git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d..git_revision:81e548572494391fa74559e816562d60c767bc69
* tools/luci-go: git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d..git_revision:81e548572494391fa74559e816562d60c767bc69
* tools/luci-go: git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d..git_revision:81e548572494391fa74559e816562d60c767bc69
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/2db94c0aa3..609c3a5216
* tools/perf: https://chromium.googlesource.com/chromium/src/tools/perf/+log/4682254401..7668723204
* tools/skia_goldctl/linux: 4iy6PO3bO0fujafbQ4I4eWhD8ErkBKf5xAnGzPrziIUC..kaeAzSau0swqM5_PxvyRfHSMDvXSjyDsqgPiP5rpoYEC
* tools/skia_goldctl/mac: _9rtsnZzHBJ4851DtK33jnz7UzMZ77SqJ9sYpciBwiMC..sZ1aXBq0Ae2kaeyAtTGpMuEEGdcqMzga658pAaCAl0IC
* tools/skia_goldctl/win: NsVk6Er035r7JVK4foqbqAksO65XEzgIT9Bjwf0Q1q0C..67QQ3-xX3VTYrb9YrwUR0VedVqNq7sebZZeHS823QdcC
No update to Clang.
Bug: angleproject:6211
Change-Id: I152572fd15066a100cb5f379f7adbd967dc6eac8
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3048852
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/DEPS b/DEPS
index 207e2f9..8212745 100644
--- a/DEPS
+++ b/DEPS
@@ -79,21 +79,21 @@
# 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': '9ac1fdf373609aac2e866e298067d78e053b6527',
+ 'catapult_revision': '10f6e4b89b5ea65a4034f675a9db5bfb50686eaf',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling luci-go
# and whatever else without interference from each other.
- 'luci_go': 'git_revision:9ee8b1d719c0d3c268e0e19282351ca78024af2d',
+ 'luci_go': 'git_revision:81e548572494391fa74559e816562d60c767bc69',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other.
- 'android_sdk_build-tools_version': '8LZujEmLjSh0g3JciDA3cslSptxKs9HOa_iUPXkOeYQC',
+ 'android_sdk_build-tools_version': 'tRoD45SCi7UleQqSV7MrMQO1_e5P8ysphkCcj6z_cCQC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_emulator_version
# and whatever else without interference from each other.
- 'android_sdk_emulator_version': 'A4EvXZUIuQho0QRDJopMUpgyp6NA3aiDQjGKPUKbowMC',
+ 'android_sdk_emulator_version': 'gMHhUuoQRKfxr-MBn3fNNXZtkAVXtOwMwT7kfx8jkIgC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_extras_version
# and whatever else without interference from each other.
@@ -105,21 +105,21 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platform-tools_version
# and whatever else without interference from each other.
- 'android_sdk_platform-tools_version': '8tF0AOj7Dwlv4j7_nfkhxWB0jzrvWWYjEIpirt8FIWYC',
+ 'android_sdk_platform-tools_version': 'qi_k82nm6j9nz4dQosOoqXew4_TFAy8rcGOHDLptx1sC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platforms_version
# and whatever else without interference from each other.
- 'android_sdk_platforms_version': 'YMUu9EHNZ__2Xcxl-KsaSf-dI5TMt_P62IseUVsxktMC',
+ 'android_sdk_platforms_version': 'lL3IGexKjYlwjO_1Ga-xwxgwbE_w-lmi2Zi1uOlWUIAC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_sources_version
# and whatever else without interference from each other.
- 'android_sdk_sources_version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C',
+ 'android_sdk_sources_version': 'n7svc8KYah-i4s8zwkVa85SI3_H0WFOniP0mpwNdFO0C',
}
deps = {
'build': {
- 'url': '{chromium_git}/chromium/src/build.git@488aac0b886533f5c5baf8214098a6afd1d46f00',
+ 'url': '{chromium_git}/chromium/src/build.git@2ef6eae721ac5661197af75fa0e8f3ed6cbc5dbc',
'condition': 'not build_with_chromium',
},
@@ -177,12 +177,12 @@
},
'testing': {
- 'url': '{chromium_git}/chromium/src/testing@8c3404999d90f3192a776dab50d26401fd676492',
+ 'url': '{chromium_git}/chromium/src/testing@b8e44ff539c942ce657c80b8c95c1a8c714ac28f',
'condition': 'not build_with_chromium',
},
'third_party/abseil-cpp': {
- 'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@9211d9e376dc8e63e20922f8f0748f67db0a8ac7',
+ 'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@368be24f93785caf831bb01fb32f10a2301ce97e',
'condition': 'not build_with_chromium',
},
@@ -225,7 +225,7 @@
},
'third_party/android_deps': {
- 'url': '{chromium_git}/chromium/src/third_party/android_deps@0ab40df9d1a1965d487b815bd8332eb25835cb6c',
+ 'url': '{chromium_git}/chromium/src/third_party/android_deps@12d2cf1a4666c3efe5c7e04885d1750cced49e65',
'condition': 'checkout_android and not build_with_chromium',
},
@@ -240,7 +240,7 @@
},
'third_party/android_sdk': {
- 'url': '{chromium_git}/chromium/src/third_party/android_sdk@76bd51b56b487cffe3876d8b3d1bb5e581e047fa',
+ 'url': '{chromium_git}/chromium/src/third_party/android_sdk@ff9352c23fda705039326319b63d1f393b9a0167',
'condition': 'checkout_android and not build_with_chromium',
},
@@ -252,7 +252,7 @@
'third_party/android_sdk/public': {
'packages': [
{
- 'package': 'chromium/third_party/android_sdk/public/build-tools/30.0.1',
+ 'package': 'chromium/third_party/android_sdk/public/build-tools/31.0.0',
'version': Var('android_sdk_build-tools_version'),
},
{
@@ -272,16 +272,16 @@
'version': Var('android_sdk_platform-tools_version'),
},
{
- 'package': 'chromium/third_party/android_sdk/public/platforms/android-30',
+ 'package': 'chromium/third_party/android_sdk/public/platforms/android-31',
'version': Var('android_sdk_platforms_version'),
},
{
- 'package': 'chromium/third_party/android_sdk/public/sources/android-29',
+ 'package': 'chromium/third_party/android_sdk/public/sources/android-30',
'version': Var('android_sdk_sources_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/cmdline-tools',
- 'version': 'V__2Ycej-H2-6AcXX5A3gi7sIk74SuN44PBm2uC_N1sC',
+ 'version': 'ZT3JmI6GMG4YVcZ1OtECRVMOLLJAWAdPbi-OclubJLMC',
},
],
'condition': 'checkout_android_native_support and not build_with_chromium',
@@ -291,8 +291,8 @@
'third_party/android_system_sdk': {
'packages': [
{
- 'package': 'chromium/third_party/android_system_sdk',
- 'version': 'no8ss5nRg6uYDM08HboypuIQuix7bS1kVqRGyWmwP-YC',
+ 'package': 'chromium/third_party/android_system_sdk/public',
+ 'version': 'oSfDIvHlCa6W0gS79Q5OOfB9E4eBg3uAvi3BEDN21U0C',
},
],
'condition': 'checkout_android and not build_with_chromium',
@@ -469,7 +469,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'Nu_mvQJe34CotIXadFlA3w732CJ9EvQGuVs4udcZedAC',
+ 'version': 'gXyBDv_fM87KnLcxvF5AGV5lwnm-JXIALYH8zrzdoaMC',
},
],
'condition': 'checkout_android and not build_with_chromium',
@@ -566,7 +566,7 @@
},
'tools/mb': {
- 'url': '{chromium_git}/chromium/src/tools/mb@2db94c0aa3c7e48fc969547bb016cee9beb4eb79',
+ 'url': '{chromium_git}/chromium/src/tools/mb@609c3a5216b3824bf568aa4c89a0f250f761e153',
'condition': 'not build_with_chromium',
},
@@ -581,7 +581,7 @@
},
'tools/perf': {
- 'url': '{chromium_git}/chromium/src/tools/perf@4682254401571093eac1e28e36a170db33ccf09a',
+ 'url': '{chromium_git}/chromium/src/tools/perf@76687232042498765fd0dc2f13d46e889a51e321',
'condition': 'not build_with_chromium',
},
@@ -599,7 +599,7 @@
'packages': [
{
'package': 'skia/tools/goldctl/linux-amd64',
- 'version': '4iy6PO3bO0fujafbQ4I4eWhD8ErkBKf5xAnGzPrziIUC',
+ 'version': 'kaeAzSau0swqM5_PxvyRfHSMDvXSjyDsqgPiP5rpoYEC',
},
],
'dep_type': 'cipd',
@@ -610,7 +610,7 @@
'packages': [
{
'package': 'skia/tools/goldctl/windows-amd64',
- 'version': 'NsVk6Er035r7JVK4foqbqAksO65XEzgIT9Bjwf0Q1q0C',
+ 'version': '67QQ3-xX3VTYrb9YrwUR0VedVqNq7sebZZeHS823QdcC',
},
],
'dep_type': 'cipd',
@@ -621,7 +621,7 @@
'packages': [
{
'package': 'skia/tools/goldctl/mac-amd64',
- 'version': '_9rtsnZzHBJ4851DtK33jnz7UzMZ77SqJ9sYpciBwiMC',
+ 'version': 'sZ1aXBq0Ae2kaeyAtTGpMuEEGdcqMzga658pAaCAl0IC',
},
],
'dep_type': 'cipd',
@@ -3177,7 +3177,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib',
- 'version': 'version:2@1.5.10.cr0',
+ 'version': 'version:2@1.5.21.cr0',
},
],
'condition': 'checkout_android and not build_with_chromium',
@@ -3188,7 +3188,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common',
- 'version': 'version:2@1.5.10.cr0',
+ 'version': 'version:2@1.5.21.cr0',
},
],
'condition': 'checkout_android and not build_with_chromium',