summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-14 01:56:54 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-14 01:56:54 +0000
commitf58d329e5fab6b84d16120375be23f228fcfc252 (patch)
treeda87623c91e862a64bd3331f4430e68130f80e4e
parentf1c9826afffc7f26e760d3a987b822ec401af0d9 (diff)
downloadchromium_src-f58d329e5fab6b84d16120375be23f228fcfc252.zip
chromium_src-f58d329e5fab6b84d16120375be23f228fcfc252.tar.gz
chromium_src-f58d329e5fab6b84d16120375be23f228fcfc252.tar.bz2
Pull buildtools repo.
This pulls the new buildtools repo which will contain sha1 references to binaries we pull from google storage. This is so related Chromium projects can shared the same binaries without individually managing versions. Review URL: https://codereview.chromium.org/281863002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270292 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--.gitignore1
-rw-r--r--DEPS17
2 files changed, 15 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 3fd0eb1..85a6db2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ v8.log
/build/util/support
/build/x64/
/build/linux/bin/eu-strip
+/buildtools
# The Chrome OS build creates a /c symlink due to http://crbug.com/54866.
/c
/ceee/internal/
diff --git a/DEPS b/DEPS
index 26ec09f..9d1541f 100644
--- a/DEPS
+++ b/DEPS
@@ -5,11 +5,14 @@
#
# To test manually, run:
# python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
-# gclient runhooks
# where <gcliendir> is the absolute path to the directory containing the
# .gclient file (the parent of "src").
-# DO NOT CHECK IN CHANGES TO .DEPS.git. It will be automatically updated by
-# a bot when you modify this one.
+#
+# Then commit .DEPS.git locally (gclient doesn't like dirty trees) and run
+# gclient sync
+# Verify the thing happened you wanted. Then revert your .DEPS.git change
+# DO NOT CHECK IN CHANGES TO .DEPS.git upstream. It will be automatically
+# updated by a bot when you modify this one.
#
# When adding a new dependency, please update the top-level .gitignore file
# to list the dependency's destination directory.
@@ -72,12 +75,20 @@ vars = {
# the commit queue can handle CLs rolling ANGLE
# and whatever else without interference from each other.
"angle_revision": "6f182c12db67a4958fa5103e7602f13bca3ad9b6",
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling build tools
+ # and whatever else without interference from each other.
+ "buildtools_revision": "8349035e86305fc9e4fd871610821336120a4bad",
}
deps = {
"src/breakpad/src":
(Var("googlecode_url") % "google-breakpad") + "/trunk/src@1325",
+ "src/buildtools":
+ Var("chromium_git") + "/chromium/buildtools.git@" +
+ Var("buildtools_revision"),
+
"src/sdch/open-vcdiff":
(Var("googlecode_url") % "open-vcdiff") + "/trunk@42",