Roll buildtools/ 893aa038d..c2e479566 (6 commits)
https://chromium.googlesource.com/chromium/src/buildtools.git/+log/893aa038dd17..c2e479566081
Include modification to split mac clang-format.sha1 handling into
separate x64/arm64 rules, per instructions in https://crrev.com/983388.
Created with:
roll-dep buildtools
Change-Id: Ia2b9e97095d6a586cb8792300e7d2e8c62e9643c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/92596
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Alan Screen <awscreen@chromium.org>
diff --git a/DEPS b/DEPS
index af0d187..decac00 100644
--- a/DEPS
+++ b/DEPS
@@ -41,7 +41,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling buildtools
# and whatever else without interference from each other.
- 'buildtools_revision': '893aa038dd17d05f3c5ff5af98daebabc294a948',
+ 'buildtools_revision': 'c2e4795660817c2776dbabd778b92ed58c074032',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
@@ -445,15 +445,29 @@
],
},
{
- 'name': 'clang_format_mac',
+ 'name': 'clang_format_mac_x64',
'pattern': '.',
- 'condition': 'host_os == "mac"',
+ 'condition': 'host_os == "mac" and host_cpu == "x64"',
'action': [ 'python3',
'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-clang-format',
- '-s', 'buildtools/mac/clang-format.sha1',
+ '-s', 'buildtools/mac/clang-format.x64.sha1',
+ '-o', 'src/buildtools/mac/clang-format',
+ ],
+ },
+ {
+ 'name': 'clang_format_mac_arm64',
+ 'pattern': '.',
+ 'condition': 'host_os == "mac" and host_cpu == "arm64"',
+ 'action': [ 'python3',
+ 'src/third_party/depot_tools/download_from_google_storage.py',
+ '--no_resume',
+ '--no_auth',
+ '--bucket', 'chromium-clang-format',
+ '-s', 'src/buildtools/mac/clang-format.arm64.sha1',
+ '-o', 'src/buildtools/mac/clang-format',
],
},
{