summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-07 00:52:44 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-07 00:52:44 +0000
commita67c002335d09b4b9035114a5651804eca9fbf7e (patch)
tree80015f8e5768e5a16c873ddcd0062a9dc06466c0 /tools
parent6117b82da99a439a5e2c02acfc320291d1c3abc2 (diff)
downloadchromium_src-a67c002335d09b4b9035114a5651804eca9fbf7e.zip
chromium_src-a67c002335d09b4b9035114a5651804eca9fbf7e.tar.gz
chromium_src-a67c002335d09b4b9035114a5651804eca9fbf7e.tar.bz2
Revert 116766 - chromeos: Merge tools/cros.DEPS/DEPS into the main DEPS.
Reason: The new git workflow system failed to convert DEPS to .DEPS.git with this patch... This is to simplify setup needed to work on Chrome for Chrome OS. cros.git and system_api.git are Chrome OS only, but pretty small. The sizes of the repositories are 1.3MB and 260KB, and the former will be gone in the not distant future. BUG=108090 TEST=the error message is shown while gclient sync as intended if .gclient contains the deprecated cros_deps rule. Review URL: http://codereview.chromium.org/9131003 TBR=satorux@chromium.org Review URL: http://codereview.chromium.org/9122018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/cros.DEPS/DEPS15
1 files changed, 12 insertions, 3 deletions
diff --git a/tools/cros.DEPS/DEPS b/tools/cros.DEPS/DEPS
index b14a5c9..17afff2 100644
--- a/tools/cros.DEPS/DEPS
+++ b/tools/cros.DEPS/DEPS
@@ -1,3 +1,12 @@
-# TODO(satorux): Remove this file after a month.
-print 'ERROR: src/tools/cros.DEPS/DEPS has been merged into src/DEPS.'
-print 'ERROR: Please remove cros.DEPS rule from your .gclient file.'
+vars = {
+ "chromiumos_git": "http://git.chromium.org/chromiumos",
+}
+
+deps_os = {
+ "unix" : {
+ "src/third_party/cros":
+ Var("chromiumos_git") + "/platform/cros.git@c709d59a",
+ "src/third_party/cros_system_api":
+ Var("chromiumos_git") + "/platform/system_api.git@58d34158",
+ }
+}