Revert 97429 - Switching IRT to be built inside the chrome build.

Dropping the IRT download step from the DEPS.

Step3 of a many step plan to switch where ppapi + irt live / are built.

BUG=None
TEST=None
R=noelallen@google.com,brettw@chromium.org
Review URL: http://codereview.chromium.org/7669058

TBR=bradnelson@google.com
Review URL: http://codereview.chromium.org/7687004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97431 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 23 insertions, 10 deletions

diff --git a/DEPS b/DEPS
index aedfea9..d673034 100644
--- a/DEPS
+++ b/DEPS
@@ -7,24 +7,28 @@ vars = {
   "webkit_revision": "93328",
   "chromium_git": "http://git.chromium.org/git",
   "swig_revision": "69281",
+  # These hashes need to be updated when nacl_revision is changed.
+  # After changing nacl_revision, run 'gclient runhooks' to get the new values.
+  "nacl_irt_hash_x86_32": "96f8b8602ee43b05898fb22302fb5eb2dded4d5c",
+  "nacl_irt_hash_x86_64": "9b04a640e6216aea7153654dee1ab264fb537478",
   "nacl_revision": "6459",
   # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
   # to update other nacl_*_revision's.
   # TODO(brettw) We should use the "From" syntax to avoid hardcoding the
   # revisions here, but it makes checkdeps confused. We should fix checkdeps.
-  "nacl_chrome_ppapi_revision": "97134", # native_client/DEPS: chrome_ppapi_rev
+  "nacl_chrome_ppapi_revision": "96903", # native_client/DEPS: chrome_ppapi_rev 
   "nacl_tools_revision": "5360",  # native_client/DEPS: tools_rev
 
   # These hashes need to be updated when nacl_toolchain_revision is changed.
   # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
   # new values.
   "nacl_toolchain_mac_x86_newlib_hash":
-      "82998a858c3b08554ad510f1992cf9a063855713",
+      "be4cc2baf6eb34c8fe155a1bb61e2acd8ca1e924",
   "nacl_toolchain_win_x86_newlib_hash":
-      "a29439ae7dc054641ee37771492a5ca7090504e8",
+      "56667d7f653b1005cd5116de3d8e9faf346053cf",
   "nacl_toolchain_linux_x86_newlib_hash":
-      "0529b0cb39e1470a609b8dfc11e1208baf8b35b1",
-  "nacl_toolchain_revision": "6473",
+      "5e4876a1fa53c7701cdbeef969a99b3ff0b0ddc5",
+  "nacl_toolchain_revision": "6429",
 
   "libjingle_revision": "77",
   "libvpx_revision": "97420",
@@ -409,6 +413,20 @@ skip_child_includes = [
 
 hooks = [
   {
+    # A change to a .gyp, .gypi, or to GYP itself should run the generator.
+    "pattern": ".",
+    "action": ["python", "src/build/gyp_chromium"],
+  },
+  {
+    # This downloads binaries for Native Client's integrated runtime (IRT)
+    # library, which is built as NaCl untrusted code.
+    "pattern": ".",
+    "action": ["python", "src/build/download_nacl_irt.py",
+               "--nacl_revision", Var("nacl_revision"),
+               "--file_hash", "x86_32", Var("nacl_irt_hash_x86_32"),
+               "--file_hash", "x86_64", Var("nacl_irt_hash_x86_64")],
+  },
+  {
     # This downloads binaries for Native Client's newlib toolchain.
     # Done in lieu of building the toolchain from scratch as it can take
     # anywhere from 30 minutes to 4 hours depending on platform to build.
@@ -425,9 +443,4 @@ hooks = [
              Var("nacl_toolchain_linux_x86_newlib_hash"),
     ],
   },
-  {
-    # A change to a .gyp, .gypi, or to GYP itself should run the generator.
-    "pattern": ".",
-    "action": ["python", "src/build/gyp_chromium"],
-  },
 ]