Roll Chromium from 384f873e0970 to 804d5a91d49d (4365 revisions)
Use per-arch clang-format binaries on Mac.
https://chromium.googlesource.com/chromium/src.git/+log/384f873e0970..804d5a91d49d
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/chromium-angle-autoroll
Please CC syoussefi@google.com,ynovikov@google.com on the revert to ensure that a human
is aware of the problem.
To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry
To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/8f75e7de55..1b3e19e7d9
* buildtools: https://chromium.googlesource.com/chromium/src/buildtools.git/+log/d8c375426d..c2e4795660
* buildtools/linux64: git_revision:bd99dbf98cbdefe18a4128189665c5761263bcfb..git_revision:bb8f66fdb5990ae5c0eb05152d51aca9a263b10d
* buildtools/mac: git_revision:bd99dbf98cbdefe18a4128189665c5761263bcfb..git_revision:bb8f66fdb5990ae5c0eb05152d51aca9a263b10d
* buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/93b8dcd57b..e9c9bdf975
* buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/d1c7f92b8b..31359e0574
* buildtools/win: git_revision:bd99dbf98cbdefe18a4128189665c5761263bcfb..git_revision:bb8f66fdb5990ae5c0eb05152d51aca9a263b10d
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/55f1dc2d27..5a80dbc44d
* third_party/abseil-cpp: https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp/+log/a4297493d8..02654402b1
* third_party/android_build_tools/bundletool: LoldiQDpZ0uTdAm5EPgZ8hBJ3La2KlTWLuaRxE7eDigC..zQILIUnCaQ93HTtR07m4ahlE9mrkkwks52L5vFaUaUUC
* third_party/android_platform: https://chromium.googlesource.com/chromium/src/third_party/android_platform/+log/87b4b48de3..2760db43ff
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..a9d86a4042
* third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/76979dae56..017544dc14
* third_party/protobuf: https://chromium.googlesource.com/chromium/src/third_party/protobuf/+log/71d78db8de..1d207dc895
* third_party/turbine: Go9J3Mz5ankZAgxmn5GxeXKdEDV73zaZp2ojNfGC1RQC..CJm6IViplElcjFYLJc0XtAjZ97BOVjQIwigcJN6C9gsC
* third_party/zlib: https://chromium.googlesource.com/chromium/src/third_party/zlib/+log/923f5eb4bf..d1aa7af3b0
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/a15c2dfa35..c8e9f238ae
* tools/luci-go: git_revision:cb424e70e75136736a86359ef070aa96425fe7a3..git_revision:6da0608e4fa8a3c6d1fa4f855485c0038b05bf72
* tools/luci-go: git_revision:cb424e70e75136736a86359ef070aa96425fe7a3..git_revision:6da0608e4fa8a3c6d1fa4f855485c0038b05bf72
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/e6f159df60..8e9cb9f939
* tools/memory: https://chromium.googlesource.com/chromium/src/tools/memory/+log/8a340b64dc..ff56ec6dea
* tools/perf: https://chromium.googlesource.com/chromium/src/tools/perf/+log/46fa9b4765..b0b65970bb
No update to Clang.
Bug: angleproject:6947, chromium:1286289
Change-Id: I08ee20fcbc79bb977e37b010c93aeccda02d5e45
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3567182
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
diff --git a/DEPS b/DEPS
index a9c658a..253beab 100644
--- a/DEPS
+++ b/DEPS
@@ -34,7 +34,7 @@
'checkout_android_native_support': 'checkout_android or checkout_chromeos',
# Version of Chromium our Chromium-based DEPS are mirrored from.
- 'chromium_revision': '384f873e097003b104ec8c22d505bc12fd8bb529',
+ 'chromium_revision': '804d5a91d49d0ad79d3d5529e6ba2610225cfe55',
# We never want to checkout chromium,
# but need a dummy DEPS entry for the autoroller
'dummy_checkout_chromium': False,
@@ -79,12 +79,12 @@
# 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': '389f33bb40a3345b73a68613178c789476ceaecf',
+ 'catapult_revision': 'a9d86a4042d785f34683f1306109c3bf11713c98',
# 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:cb424e70e75136736a86359ef070aa96425fe7a3',
+ 'luci_go': 'git_revision:6da0608e4fa8a3c6d1fa4f855485c0038b05bf72',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version
@@ -119,12 +119,12 @@
deps = {
'build': {
- 'url': '{chromium_git}/chromium/src/build.git@8f75e7de55882e309c982e8d203f7ad0f354e10e',
+ 'url': '{chromium_git}/chromium/src/build.git@1b3e19e7d95f8137da3f4881911b9bd175618f09',
'condition': 'not build_with_chromium',
},
'buildtools': {
- 'url': '{chromium_git}/chromium/src/buildtools.git@d8c375426d8f7f4147f7d4109bb63c12655fb8d6',
+ 'url': '{chromium_git}/chromium/src/buildtools.git@c2e4795660817c2776dbabd778b92ed58c074032',
'condition': 'not build_with_chromium',
},
@@ -137,7 +137,7 @@
'packages': [
{
'package': 'gn/gn/linux-amd64',
- 'version': 'git_revision:bd99dbf98cbdefe18a4128189665c5761263bcfb',
+ 'version': 'git_revision:bb8f66fdb5990ae5c0eb05152d51aca9a263b10d',
}
],
'dep_type': 'cipd',
@@ -148,7 +148,7 @@
'packages': [
{
'package': 'gn/gn/mac-${{arch}}',
- 'version': 'git_revision:bd99dbf98cbdefe18a4128189665c5761263bcfb',
+ 'version': 'git_revision:bb8f66fdb5990ae5c0eb05152d51aca9a263b10d',
}
],
'dep_type': 'cipd',
@@ -161,12 +161,12 @@
},
'buildtools/third_party/libc++abi/trunk': {
- 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@93b8dcd57bd8ebe201ec24f7257339988ed2ef7c',
+ 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@e9c9bdf97591f694e9d11159a3aacc76d495b63c',
'condition': 'not build_with_chromium',
},
'buildtools/third_party/libunwind/trunk': {
- 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@d1c7f92b8b0bff8d9f710ca40e44563a63db376e',
+ 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@31359e057479f4c48b1fd9afd7ddf8b2134d68b1',
'condition': 'not build_with_chromium',
},
@@ -174,7 +174,7 @@
'packages': [
{
'package': 'gn/gn/windows-amd64',
- 'version': 'git_revision:bd99dbf98cbdefe18a4128189665c5761263bcfb',
+ 'version': 'git_revision:bb8f66fdb5990ae5c0eb05152d51aca9a263b10d',
}
],
'dep_type': 'cipd',
@@ -182,12 +182,12 @@
},
'testing': {
- 'url': '{chromium_git}/chromium/src/testing@55f1dc2d27cd6d5f8cdc4182ec30f5096dedbf51',
+ 'url': '{chromium_git}/chromium/src/testing@5a80dbc44d23f6f5ea0ae3f989879d3e6bf328d8',
'condition': 'not build_with_chromium',
},
'third_party/abseil-cpp': {
- 'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@a4297493d86022b91c93f7c1de29e9ad0a0e2489',
+ 'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@02654402b1895e10dc032add903be6aea38d03bf',
'condition': 'not build_with_chromium',
},
@@ -222,7 +222,7 @@
'packages': [
{
'package': 'chromium/third_party/android_build_tools/bundletool',
- 'version': 'LoldiQDpZ0uTdAm5EPgZ8hBJ3La2KlTWLuaRxE7eDigC',
+ 'version': 'zQILIUnCaQ93HTtR07m4ahlE9mrkkwks52L5vFaUaUUC',
},
],
'condition': 'checkout_android and not build_with_chromium',
@@ -240,7 +240,7 @@
},
'third_party/android_platform': {
- 'url': '{chromium_git}/chromium/src/third_party/android_platform@87b4b48de3c8204224d63612c287eb5a447a562d',
+ 'url': '{chromium_git}/chromium/src/third_party/android_platform@2760db43ffc8b074cb7960c90b5254f74a5c299a',
'condition': 'checkout_android and not build_with_chromium',
},
@@ -332,7 +332,7 @@
},
'third_party/depot_tools': {
- 'url': '{chromium_git}/chromium/tools/depot_tools.git@76979dae56c08d24b092347a1bdd2abe474555a3',
+ 'url': '{chromium_git}/chromium/tools/depot_tools.git@017544dc14559772306d0af2b8589690f3b28fea',
'condition': 'not build_with_chromium',
},
@@ -439,7 +439,7 @@
},
'third_party/protobuf': {
- 'url': '{chromium_git}/chromium/src/third_party/protobuf@71d78db8def0833cf17178d54fe63b20b97e80ce',
+ 'url': '{chromium_git}/chromium/src/third_party/protobuf@1d207dc8959349e8c88e12a19f46702a608f7832',
'condition': 'not build_with_chromium',
},
@@ -504,7 +504,7 @@
'packages': [
{
'package': 'chromium/third_party/turbine',
- 'version': 'Go9J3Mz5ankZAgxmn5GxeXKdEDV73zaZp2ojNfGC1RQC',
+ 'version': 'CJm6IViplElcjFYLJc0XtAjZ97BOVjQIwigcJN6C9gsC',
},
],
'condition': 'checkout_android and not build_with_chromium',
@@ -531,7 +531,7 @@
},
'third_party/zlib': {
- 'url': '{chromium_git}/chromium/src/third_party/zlib@923f5eb4bfa403d0f14d9cbca2cdf7fa7416ee67',
+ 'url': '{chromium_git}/chromium/src/third_party/zlib@d1aa7af3b0525865d17c273205c353f975027b7a',
'condition': 'not build_with_chromium',
},
@@ -541,7 +541,7 @@
},
'tools/clang': {
- 'url': '{chromium_git}/chromium/src/tools/clang.git@a15c2dfa35177dc21577a1760e8f4c0c1e854da6',
+ 'url': '{chromium_git}/chromium/src/tools/clang.git@c8e9f238ae062be7183109c794791150597847d3',
'condition': 'not build_with_chromium',
},
@@ -572,7 +572,7 @@
},
'tools/mb': {
- 'url': '{chromium_git}/chromium/src/tools/mb@e6f159df60d1788f9a5edf8ca32e456f0c72949b',
+ 'url': '{chromium_git}/chromium/src/tools/mb@8e9cb9f939a278b2533698b3e29d28bcf6c00321',
'condition': 'not build_with_chromium',
},
@@ -582,12 +582,12 @@
},
'tools/memory': {
- 'url': '{chromium_git}/chromium/src/tools/memory@8a340b64dce4b578494881a1112cfa11b72330e2',
+ 'url': '{chromium_git}/chromium/src/tools/memory@ff56ec6dea1a17293134a1f3932fbc4bea8943df',
'condition': 'not build_with_chromium',
},
'tools/perf': {
- 'url': '{chromium_git}/chromium/src/tools/perf@46fa9b4765c61bdff3e147cd68accabc4d1fe0db',
+ 'url': '{chromium_git}/chromium/src/tools/perf@b0b65970bbac48e49f45fd3e164e74125f19036e',
'condition': 'not build_with_chromium',
},
@@ -3666,16 +3666,31 @@
],
},
{
- 'name': 'clang_format_mac',
+ 'name': 'clang_format_mac_x64',
'pattern': '.',
- 'condition': 'host_os == "mac" and not build_with_chromium',
+ 'condition': 'host_os == "mac" and host_cpu == "x64" and not build_with_chromium',
'action': [ 'python3',
'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=darwin',
'--no_auth',
'--bucket', 'chromium-clang-format',
- '-s', 'buildtools/mac/clang-format.sha1',
+ '-s', 'buildtools/mac/clang-format.x64.sha1',
+ '-o', 'buildtools/mac/clang-format',
+ ],
+ },
+ {
+ 'name': 'clang_format_mac_arm64',
+ 'pattern': '.',
+ 'condition': 'host_os == "mac" and host_cpu == "arm64" and not build_with_chromium',
+ 'action': [ 'python3',
+ 'third_party/depot_tools/download_from_google_storage.py',
+ '--no_resume',
+ '--platform=darwin',
+ '--no_auth',
+ '--bucket', 'chromium-clang-format',
+ '-s', 'buildtools/mac/clang-format.arm64.sha1',
+ '-o', 'buildtools/mac/clang-format',
],
},
{