Revert 97753 - Attempting to re-land 97421 (with different deps revs):

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.
Review URL: http://codereview.chromium.org/7669058

R=noelallen@google.com
BUG=None
TEST=None

TBR
Review URL: http://codereview.chromium.org/7685002

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

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

1 files changed, 22 insertions, 9 deletions

diff --git a/DEPS b/DEPS
index adeed07..ae96b33 100644
--- a/DEPS
+++ b/DEPS
@@ -7,6 +7,10 @@ vars = {
   "webkit_revision": "93506",
   "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": "3da71eefa07c815a1aed9dc3a379fc41efda4b6b",
+  "nacl_irt_hash_x86_64": "147077c09e87ff2db20d32af2054bfb4de343c20",
   "nacl_revision": "6499",
   # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
   # to update other nacl_*_revision's.
@@ -19,12 +23,12 @@ vars = {
   # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
   # new values.
   "nacl_toolchain_mac_x86_newlib_hash":
-      "1b0855435c03c435a011c6105a509624b2a4edaa",
+      "be4cc2baf6eb34c8fe155a1bb61e2acd8ca1e924",
   "nacl_toolchain_win_x86_newlib_hash":
-      "5038a47b5a9a49acdc36cbe311aec7bce575c164",
+      "56667d7f653b1005cd5116de3d8e9faf346053cf",
   "nacl_toolchain_linux_x86_newlib_hash":
-      "01e245dc6dca16bea5cf840dbc77e3aa138f234f",
-  "nacl_toolchain_revision": "6494",
+      "5e4876a1fa53c7701cdbeef969a99b3ff0b0ddc5",
+  "nacl_toolchain_revision": "6429",
 
   "libjingle_revision": "77",
   "libvpx_revision": "97420",
@@ -406,6 +410,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.
@@ -422,9 +440,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"],
-  },
 ]