Switching NaCl IRT to be built inside the chrome build.
Fifth attempt to land!
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
are built.
Dropping download_nacl_irt because we no longer rely on a prebuilt copy.
Dropping irt download drop source tarball (assume people using it will have
to download / build their own nacl toolchain).
Old Review URL: http://codereview.chromium.org/7669058
[email protected]
BUG=http://code.google.com/p/chromium/issues/detail?id=93520
TEST=None
Review URL: http://codereview.chromium.org/7693028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98106 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index fb2bc3db..203f3d9 100644
--- a/DEPS
+++ b/DEPS
@@ -7,10 +7,6 @@
"webkit_revision": "93705",
"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.
@@ -23,12 +19,12 @@
# After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
# new values.
"nacl_toolchain_mac_x86_newlib_hash":
- "be4cc2baf6eb34c8fe155a1bb61e2acd8ca1e924",
+ "1b0855435c03c435a011c6105a509624b2a4edaa",
"nacl_toolchain_win_x86_newlib_hash":
- "56667d7f653b1005cd5116de3d8e9faf346053cf",
+ "5038a47b5a9a49acdc36cbe311aec7bce575c164",
"nacl_toolchain_linux_x86_newlib_hash":
- "5e4876a1fa53c7701cdbeef969a99b3ff0b0ddc5",
- "nacl_toolchain_revision": "6429",
+ "01e245dc6dca16bea5cf840dbc77e3aa138f234f",
+ "nacl_toolchain_revision": "6494",
"libjingle_revision": "77",
"libvpx_revision": "97420",
@@ -410,20 +406,6 @@
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.
@@ -440,4 +422,9 @@
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"],
+ },
]
