Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: DEPS

Issue 7701026: Revert 97987 - Switching NaCl IRT to be built inside the chrome build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/download_nacl_irt.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
===================================================================
--- DEPS (revision 98029)
+++ DEPS (working copy)
@@ -7,6 +7,10 @@
"webkit_revision": "93695",
"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 @@
# 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 @@
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 @@
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"],
- },
]
« no previous file with comments | « no previous file | build/download_nacl_irt.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698