Reorder hooks to run in a particular order.
"win_toolchain" should run before "clang". This has been the case for
years in Chromium. See https://crrev.com/296090
Bug: chromium:584393,chromium:662325
Change-Id: Ic8e1d54afb0a76a1ed3f198a2d24e97217f8347e
Reviewed-on: https://pdfium-review.googlesource.com/c/50350
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
diff --git a/DEPS b/DEPS
index fc7ce87..2a4f8ea 100644
--- a/DEPS
+++ b/DEPS
@@ -149,6 +149,32 @@
hooks = [
{
+ # Case-insensitivity for the Win SDK. Must run before win_toolchain below.
+ 'name': 'ciopfs_linux',
+ 'pattern': '.',
+ 'condition': 'checkout_win and host_os == "linux"',
+ 'action': [ 'python',
+ 'pdfium/third_party/depot_tools/download_from_google_storage.py',
+ '--no_resume',
+ '--no_auth',
+ '--bucket', 'chromium-browser-clang/ciopfs',
+ '-s', 'pdfium/build/ciopfs.sha1',
+ ]
+ },
+ {
+ # Update the Windows toolchain if necessary. Must run before 'clang' below.
+ 'name': 'win_toolchain',
+ 'pattern': '.',
+ 'condition': 'checkout_win',
+ 'action': ['python', 'pdfium/build/vs_toolchain.py', 'update', '--force'],
+ },
+ {
+ # Update the Mac toolchain if necessary.
+ 'name': 'mac_toolchain',
+ 'pattern': '.',
+ 'action': ['python', 'pdfium/build/mac_toolchain.py'],
+ },
+ {
'name': 'gn_win',
'action': [ 'download_from_google_storage',
'--no_resume',
@@ -180,8 +206,8 @@
'-s', 'pdfium/buildtools/linux64/gn.sha1',
],
},
- # Pull clang-format binaries using checked-in hashes.
{
+ # Pull clang-format binaries using checked-in hashes.
'name': 'clang_format_win',
'pattern': '.',
'action': [ 'download_from_google_storage',
@@ -215,7 +241,7 @@
],
},
{
- # Pull clang
+ # Note: On Win, this should run after win_toolchain, as it may use it.
'name': 'clang',
'pattern': '.',
'action': ['python',
@@ -267,32 +293,6 @@
'--arch=x64'],
},
{
- # Case-insensitivity for the Win SDK. Must run before win_toolchain below.
- 'name': 'ciopfs_linux',
- 'pattern': '.',
- 'condition': 'checkout_win and host_os == "linux"',
- 'action': [ 'python',
- 'pdfium/third_party/depot_tools/download_from_google_storage.py',
- '--no_resume',
- '--no_auth',
- '--bucket', 'chromium-browser-clang/ciopfs',
- '-s', 'pdfium/build/ciopfs.sha1',
- ]
- },
- {
- # Update the Windows toolchain if necessary.
- 'name': 'win_toolchain',
- 'pattern': '.',
- 'condition': 'checkout_win',
- 'action': ['python', 'pdfium/build/vs_toolchain.py', 'update', '--force'],
- },
- {
- # Update the Mac toolchain if necessary.
- 'name': 'mac_toolchain',
- 'pattern': '.',
- 'action': ['python', 'pdfium/build/mac_toolchain.py'],
- },
- {
'name': 'msan_chained_origins',
'pattern': '.',
'condition': 'checkout_instrumented_libraries',
