diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 20:00:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 20:00:05 +0000 |
| commit | 91c3c300069d27c6ec8749636fec1c4c9018b29f (patch) | |
| tree | 2bb27e2885499a3305fc58eda9f25233f2366782 | |
| parent | bff09683af717b4480bf34daf0ee63a9d3bea8ae (diff) | |
| download | chromium_src-91c3c300069d27c6ec8749636fec1c4c9018b29f.zip chromium_src-91c3c300069d27c6ec8749636fec1c4c9018b29f.tar.gz chromium_src-91c3c300069d27c6ec8749636fec1c4c9018b29f.tar.bz2 | |
Revert 84470 (we want DEPS files to stay simple as discussed in irc. Also, this broke tools/sync-webkit-git.py) - Remove nacl_tools_revision and get the appropriate folders/revisions from native client's DEPS file
BUG=none
TEST=trybots,gclient sync
Review URL: http://codereview.chromium.org/6933043
TBR=elijahtaylor@google.com
Review URL: http://codereview.chromium.org/6952009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84485 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 12 | ||||
| -rwxr-xr-x | tools/checkdeps/checkdeps.py | 9 |
2 files changed, 8 insertions, 13 deletions
@@ -11,6 +11,7 @@ vars = { "nacl_irt_hash_x86_32": "22aa515c504417708751f081f4b4325c0cebb1c7", "nacl_irt_hash_x86_64": "3f345b96ba52220f404140d73f75d5443818774a", "nacl_revision": "5062", + "nacl_tools_revision": "5025", "libjingle_revision": "55", "libvpx_revision": "81610", "ffmpeg_revision": "83815", @@ -19,9 +20,6 @@ vars = { } deps = { - "src/native_client/nacl_deps": - File(Var("nacl_trunk") + "/src/native_client/DEPS@" + Var("nacl_revision")), - "src/breakpad/src": (Var("googlecode_url") % "google-breakpad") + "/trunk/src@786", @@ -225,9 +223,10 @@ deps = { # Needed to support nacl browser test jig. "src/third_party/pylib": - From("src/native_client/nacl_deps", "third_party/pylib"), + Var("nacl_trunk") + "/src/third_party/pylib@" + Var("nacl_tools_revision"), "src/third_party/scons-2.0.1": - From("src/native_client/nacl_deps", "third_party/scons-2.0.1"), + Var("nacl_trunk") + "/src/third_party/scons-2.0.1@" + + Var("nacl_tools_revision"), } @@ -269,7 +268,8 @@ deps_os = { "/trunk/deps/third_party/swig/win@" + Var("swig_revision"), "src/third_party/mingw-w64/mingw/bin": - From("src/native_client/nacl_deps", "third_party/mingw-w64/mingw/bin"), + (Var("nacl_trunk") + "/src/third_party/mingw-w64/mingw/bin@" + + Var("nacl_tools_revision")), "src/rlz": (Var("googlecode_url") % "rlz") + "/trunk@35", diff --git a/tools/checkdeps/checkdeps.py b/tools/checkdeps/checkdeps.py index 5649a98..e7c49a2 100755 --- a/tools/checkdeps/checkdeps.py +++ b/tools/checkdeps/checkdeps.py @@ -243,12 +243,9 @@ def ApplyDirectoryRules(existing_rules, dir_name): # Check the DEPS file in this directory. if VERBOSE: print "Applying rules from", dir_name - def FromImpl(unused, unused2): + def FromImpl(unused): pass # NOP function so "From" doesn't fail. - def FileImpl(unused): - pass # NOP function so "File" doesn't fail. - class _VarImpl: def __init__(self, local_scope): self._local_scope = local_scope @@ -260,9 +257,7 @@ def ApplyDirectoryRules(existing_rules, dir_name): raise Error("Var is not defined: %s" % var_name) local_scope = {} - global_scope = {"From": FromImpl, - "File": FileImpl, - "Var": _VarImpl(local_scope).Lookup} + global_scope = {"From": FromImpl, "Var": _VarImpl(local_scope).Lookup} deps_file = os.path.join(dir_name, "DEPS") if os.path.isfile(deps_file): |