diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 17:59:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 17:59:06 +0000 |
| commit | 7f5fbfbbae9ccf7820aa9c299115ec51ac134f04 (patch) | |
| tree | b0bbe75f094d39368c798a6da5f424932eb0ea22 /DEPS | |
| parent | 00421b7b905e80fe6ab2d8827b9ce67f023e188e (diff) | |
| download | chromium_src-7f5fbfbbae9ccf7820aa9c299115ec51ac134f04.zip chromium_src-7f5fbfbbae9ccf7820aa9c299115ec51ac134f04.tar.gz chromium_src-7f5fbfbbae9ccf7820aa9c299115ec51ac134f04.tar.bz2 | |
Update checkdeps to deal with the more recent From() syntax, and re-enable
From() usage for pulling NaCl's copy of PPAPI.
TEST=checkdeps
BUG=none
Review URL: http://codereview.chromium.org/7347012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -11,7 +11,7 @@ vars = { # After changing nacl_revision, run 'gclient runhooks' to get the new values. "nacl_irt_hash_x86_32": "40737ff789c03561a79dc7802f16e84d4dbe3b07", "nacl_irt_hash_x86_64": "8d7d2f6f5ef19467981eb89ab2a138e79aa5926d", - "nacl_revision": "5988", # If you update this, change ppapi below. + "nacl_revision": "5988", "nacl_tools_revision": "5360", # tools_rev in native_client/DEPS "libjingle_revision": "71", "libvpx_revision": "90416", @@ -84,15 +84,11 @@ deps = { "src/native_client": Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), + # Pull Native Client's version of PPAPI. This means we'll have two copies + # in the tree with potentially different revisions. The Native Client build + # is done to handle this and always use its own copy. "src/native_client/src/third_party/ppapi": - # TODO(brettw) We should use this "From" syntax to avoid hardcoding the - # revision here, but it makes checkdeps confused. We should fix checkdeps - # and re-enable the From() line. - # - # Currently, take the revision of PPAPI from the DEPS file of the NaCl - # revision you're pulling. - #From("src/native_client", "native_client/src/third_party/ppapi"), - "http://src.chromium.org/svn/trunk/src/ppapi@91987", + From("src/native_client", "native_client/src/third_party/ppapi"), "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + |