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

Unified Diff: DEPS

Issue 7669058: Switching 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 | chrome/build_nacl_irt.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
===================================================================
--- DEPS (revision 97427)
+++ DEPS (working copy)
@@ -7,28 +7,24 @@
"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": "96903", # native_client/DEPS: chrome_ppapi_rev
+ "nacl_chrome_ppapi_revision": "97134", # 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":
- "be4cc2baf6eb34c8fe155a1bb61e2acd8ca1e924",
+ "82998a858c3b08554ad510f1992cf9a063855713",
"nacl_toolchain_win_x86_newlib_hash":
- "56667d7f653b1005cd5116de3d8e9faf346053cf",
+ "a29439ae7dc054641ee37771492a5ca7090504e8",
"nacl_toolchain_linux_x86_newlib_hash":
- "5e4876a1fa53c7701cdbeef969a99b3ff0b0ddc5",
- "nacl_toolchain_revision": "6429",
+ "0529b0cb39e1470a609b8dfc11e1208baf8b35b1",
+ "nacl_toolchain_revision": "6473",
"libjingle_revision": "77",
"libvpx_revision": "97420",
@@ -413,20 +409,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.
@@ -443,4 +425,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"],
+ },
]
« no previous file with comments | « no previous file | chrome/build_nacl_irt.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698