generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Chromium's src/buildtools to DEPS.

Browse Source 
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
This commit is contained in:
kjellander@webrtc.org 2014-06-26 14:02:16 +00:00
parent 19db3e3164
commit 1d1e40f36e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -36,6 +36,7 @@
.sw? .sw?
/Makefile /Makefile
/build /build
/buildtools
/chromium_deps /chromium_deps
/chromium_gn /chromium_gn
/google_apis/build /google_apis/build

19
DEPS
View File

@ -29,6 +29,9 @@ deps = {
"build": "build":
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
"buildtools":
From("chromium_deps", "src/buildtools"),
# Needed by common.gypi. # Needed by common.gypi.
"google_apis/build": "google_apis/build":
Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"),
@ -244,46 +247,46 @@ hooks = [
# Pull GN binaries. This needs to be before running GYP below. # Pull GN binaries. This needs to be before running GYP below.
{ {
"name": "gn_win", "name": "gn_win",
"pattern": "tools/gn/bin/win/gn.exe.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=win32", "--platform=win32",
"--no_auth", "--no_auth",
"--bucket", "chromium-gn", "--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", "name": "gn_mac",
"pattern": "tools/gn/bin/mac/gn.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=darwin", "--platform=darwin",
"--no_auth", "--no_auth",
"--bucket", "chromium-gn", "--bucket", "chromium-gn",
"-s", Var("root_dir") + "/tools/gn/bin/mac/gn.sha1", "-s", Var("root_dir") + "/buildtools/mac/gn.sha1",
], ],
}, },
{ {
"name": "gn_linux", "name": "gn_linux",
"pattern": "tools/gn/bin/linux/gn.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=linux*", "--platform=linux*",
"--no_auth", "--no_auth",
"--bucket", "chromium-gn", "--bucket", "chromium-gn",
"-s", Var("root_dir") + "/tools/gn/bin/linux/gn.sha1", "-s", Var("root_dir") + "/buildtools/linux64/gn.sha1",
], ],
}, },
{ {
"name": "gn_linux32", "name": "gn_linux32",
"pattern": "tools/gn/bin/linux/gn32.sha1", "pattern": ".",
"action": [ "download_from_google_storage", "action": [ "download_from_google_storage",
"--no_resume", "--no_resume",
"--platform=linux*", "--platform=linux*",
"--no_auth", "--no_auth",
"--bucket", "chromium-gn", "--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. # Pull clang-format binaries using checked-in hashes.