Add Chromium's src/buildtools to DEPS.
GN for WebRTC was broken by the depot_tools change in
https://codereview.chromium.org/341533006/ that changes
the gn.py wrapper to use GN in src/buildtools instead of the
previous location in tools/gn/bin.
This buildtools repo was added for Chromium in
https://codereview.chromium.org/281863002 and the hooks were
updated in https://codereview.chromium.org/340153002
This adds the buildtools dir and updates our download hooks.
BUG=webrtc:3441
TEST=Locally running GN (trybots currently cannot handle DEPS changes properly)
R=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/15929004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6546 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/DEPS b/DEPS
index 5df8834..01ec2c9 100644
--- a/DEPS
+++ b/DEPS
@@ -29,6 +29,9 @@
"build":
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
+ "buildtools":
+ From("chromium_deps", "src/buildtools"),
+
# Needed by common.gypi.
"google_apis/build":
Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"),
@@ -244,46 +247,46 @@
# Pull GN binaries. This needs to be before running GYP below.
{
"name": "gn_win",
- "pattern": "tools/gn/bin/win/gn.exe.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=win32",
"--no_auth",
"--bucket", "chromium-gn",
- "-s", Var("root_dir") + "/tools/gn/bin/win/gn.exe.sha1",
+ "-s", Var("root_dir") + "/buildtools/win/gn.exe.sha1",
],
},
{
"name": "gn_mac",
- "pattern": "tools/gn/bin/mac/gn.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=darwin",
"--no_auth",
"--bucket", "chromium-gn",
- "-s", Var("root_dir") + "/tools/gn/bin/mac/gn.sha1",
+ "-s", Var("root_dir") + "/buildtools/mac/gn.sha1",
],
},
{
"name": "gn_linux",
- "pattern": "tools/gn/bin/linux/gn.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=linux*",
"--no_auth",
"--bucket", "chromium-gn",
- "-s", Var("root_dir") + "/tools/gn/bin/linux/gn.sha1",
+ "-s", Var("root_dir") + "/buildtools/linux64/gn.sha1",
],
},
{
"name": "gn_linux32",
- "pattern": "tools/gn/bin/linux/gn32.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=linux*",
"--no_auth",
"--bucket", "chromium-gn",
- "-s", Var("root_dir") + "/tools/gn/bin/linux/gn32.sha1",
+ "-s", Var("root_dir") + "/buildtools/linux32/gn.sha1",
],
},
# Pull clang-format binaries using checked-in hashes.