diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 21:38:26 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 21:38:26 +0000 |
| commit | 97b384d9871f5415f414646f3063c46398da1cd0 (patch) | |
| tree | 58899671ba9e63511d597dc40beac21df73a6e08 | |
| parent | 8fb43a6b1a44e64f57c1fa04d583e1d3b8930e80 (diff) | |
| download | chromium_src-97b384d9871f5415f414646f3063c46398da1cd0.zip chromium_src-97b384d9871f5415f414646f3063c46398da1cd0.tar.gz chromium_src-97b384d9871f5415f414646f3063c46398da1cd0.tar.bz2 | |
chromeos: Merge tools/cros.DEPS/DEPS into the main DEPS.
This is to simplify setup needed to work on Chrome for Chrome OS.
system_api.git is Chrome OS only, but pretty small (324KB including
files in .git directory).
Note that the previous attempt (crrev.com/116766) was reverted as
deps2git didn't support git dependencies at that time, but the issue
is now fixed (crbug.com/109475)
BUG=108090
TEST=the error message is shown while gclient sync as intended if .gclient contains the deprecated cros_deps rule.
Review URL: https://chromiumcodereview.appspot.com/10696055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145000 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 5 | ||||
| -rw-r--r-- | tools/cros.DEPS/DEPS | 16 | ||||
| -rw-r--r-- | tools/cros.DEPS/README | 15 |
3 files changed, 8 insertions, 28 deletions
@@ -10,6 +10,7 @@ vars = { "nacl_trunk": "http://src.chromium.org/native_client/trunk", "webkit_revision": "121540", "chromium_git": "http://git.chromium.org/git", + "chromiumos_git": "http://git.chromium.org/chromiumos", "swig_revision": "69281", "nacl_revision": "9053", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS @@ -442,6 +443,10 @@ deps_os = { "src/third_party/gold": "/trunk/deps/third_party/gold@124239", + + # For Chromium OS. + "src/third_party/cros_system_api": + Var("chromiumos_git") + "/platform/system_api.git@a6b76c4e", }, "android": { "src/third_party/freetype": diff --git a/tools/cros.DEPS/DEPS b/tools/cros.DEPS/DEPS index 4a0bc03..b14a5c9 100644 --- a/tools/cros.DEPS/DEPS +++ b/tools/cros.DEPS/DEPS @@ -1,13 +1,3 @@ -# When adding a new dependency, please update the top-level .gitignore file -# to list the dependency's destination directory. - -vars = { - "chromiumos_git": "http://git.chromium.org/chromiumos", -} - -deps_os = { - "unix" : { - "src/third_party/cros_system_api": - Var("chromiumos_git") + "/platform/system_api.git@a6b76c4e", - } -} +# 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.' diff --git a/tools/cros.DEPS/README b/tools/cros.DEPS/README deleted file mode 100644 index 16a0043..0000000 --- a/tools/cros.DEPS/README +++ /dev/null @@ -1,15 +0,0 @@ -This DEPS file specifies the extra dependencies required to build -Chromium for Chromium OS. It lives here in src/tools/cros.DEPS, but -is generally checked out to another location by a custom rule in your -.gclient file, often a cros_deps/ directory next to your src/ -directory. For example: - - { "name" : "cros_deps", - "url" : "http://src.chromium.org/svn/trunk/src/tools/cros.DEPS" - }, - -If you want to rev these deps and publish them for all to see, -edit src/tools/cros.DEPS/DEPS. If you want to rev the deps locally first, -edit the file in the location to which your .gclient file checks it out -(in most cases, cros_deps/DEPS), but note that you cannot push a modification -from there. |