DEPS: Include a pinned version of depot_tools.
This will align the ANGLE standalone build more with Chromium.
It can catch some kinds of build break on the CQ, preventing
some churn, and also will let us cache the vs_toolchain without
needing a special named cache.
Also includes a necessary tool to cross-compile Win on Linux.
Patch series:
1. This CL
2. http://crrev.com/c/2819472
3. http://crrev.com/c/2819945
Bug: angleproject:5842
Change-Id: Idaee3b44d970d1171076a8eaa09e3e0555331d49
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2819943
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/DEPS b/DEPS
index 0d82b7c..06344b9 100644
--- a/DEPS
+++ b/DEPS
@@ -159,6 +159,11 @@
'condition': 'not build_with_chromium',
},
+ 'third_party/depot_tools': {
+ 'url': '{chromium_git}/chromium/tools/depot_tools.git@1cabb17575917b73ec2e270d4187656c20b1ab0c',
+ 'condition': 'not build_with_chromium',
+ },
+
# We never want to checkout chromium,
# but need a dummy DEPS entry for the autoroller
'third_party/dummy_chromium': {
@@ -1081,12 +1086,26 @@
}
hooks = [
+ {
+ # Ensure that the DEPS'd "depot_tools" has its self-update capability
+ # disabled.
+ 'name': 'disable_depot_tools_selfupdate',
+ 'pattern': '.',
+ 'condition': 'not build_with_chromium',
+ 'action': [
+ 'python',
+ 'third_party/depot_tools/update_depot_tools_toggle.py',
+ '--disable',
+ ],
+ },
+
# Pull clang-format binaries using checked-in hashes.
{
'name': 'clang_format_win',
'pattern': '.',
'condition': 'host_os == "win" and not build_with_chromium',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=win32',
'--no_auth',
@@ -1098,7 +1117,8 @@
'name': 'clang_format_mac',
'pattern': '.',
'condition': 'host_os == "mac" and not build_with_chromium',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=darwin',
'--no_auth',
@@ -1110,7 +1130,8 @@
'name': 'clang_format_linux',
'pattern': '.',
'condition': 'host_os == "linux" and not build_with_chromium',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=linux*',
'--no_auth',
@@ -1133,6 +1154,19 @@
'--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" and not build_with_chromium',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
+ '--no_resume',
+ '--no_auth',
+ '--bucket', 'chromium-browser-clang/ciopfs',
+ '-s', 'build/ciopfs.sha1',
+ ]
+ },
+ {
# Update the Windows toolchain if necessary. Must run before 'clang' below.
'name': 'win_toolchain',
'pattern': '.',
@@ -1169,7 +1203,8 @@
'name': 'rc_win',
'pattern': '.',
'condition': 'checkout_win and (host_os == "win" and not build_with_chromium)',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-browser-clang/rc',
@@ -1192,7 +1227,8 @@
'name': 'linux_glslang_validator',
'pattern': '.',
'condition': 'checkout_linux and not build_with_chromium',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=linux*',
'--no_auth',
@@ -1206,7 +1242,8 @@
'name': 'win_glslang_validator',
'pattern': '.',
'condition': 'checkout_win and not build_with_chromium',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=win32*',
'--no_auth',
@@ -1220,7 +1257,8 @@
'name': 'linux_flex_bison',
'pattern': '.',
'condition': 'checkout_linux and not build_with_chromium',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=linux*',
'--no_auth',
@@ -1234,7 +1272,8 @@
'name': 'win_flex_bison',
'pattern': '.',
'condition': 'checkout_win and not build_with_chromium',
- 'action': [ 'download_from_google_storage',
+ 'action': [ 'python',
+ 'third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
'--platform=win32*',
'--no_auth',