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

Unified Diff: DEPS

Issue 8677032: Bumping nacl rev into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
===================================================================
--- DEPS (revision 111404)
+++ DEPS (working copy)
@@ -8,7 +8,7 @@
"webkit_revision": "101035",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "7169",
+ "nacl_revision": "7281",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "7139", # native_client/DEPS: tools_rev
@@ -16,13 +16,19 @@
# 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_linux_x86_hash":
+ "33afa1cefa7fd2a7270b309298dbbf93361d90db",
+ "nacl_toolchain_linux_x86_newlib_hash":
+ "5f82c18ce9d0201f9df852bddcb19746ef690290",
+ "nacl_toolchain_mac_x86_hash":
+ "f7b73f3d9073b75bb1ef6b583eaf56f397ca80ed",
"nacl_toolchain_mac_x86_newlib_hash":
- "74612a65dd6bae1d85af1f7277cc6af6e5d86b46",
+ "648b5ae8ae770b41c4a0eef28cff6f67fe8bb386",
+ "nacl_toolchain_win_x86_hash":
+ "75ee1d6f8c758d9580b2c35773b14d0ab6847372",
"nacl_toolchain_win_x86_newlib_hash":
- "3672e7b20848beec886badc46909cf24fb1c574f",
- "nacl_toolchain_linux_x86_newlib_hash":
- "528b9b85d087ffb5a0f6348f5219a33cd0ff725f",
- "nacl_toolchain_revision": "7098",
+ "a340bc72900f002f88491bf82baf69d35593ed75",
+ "nacl_toolchain_revision": "7258",
"libjingle_revision": "95",
"libvpx_revision": "109236",
@@ -102,7 +108,13 @@
"src/native_client":
Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
+
+ "src/native_client_sdk/src/site_scons":
+ Var("nacl_trunk") + "/src/native_client/site_scons@" + Var("nacl_revision"),
+ "src/third_party/pymox":
+ "http://pymox.googlecode.com/svn/trunk@61",
+
"src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
Var("nacl_revision"),
@@ -423,14 +435,23 @@
"pattern": ".",
"action": [
"python", "src/build/download_nacl_toolchains.py",
+ "--no-pnacl",
+ "--no-arm-trusted",
"--x86-version", Var("nacl_toolchain_revision"),
- "--nacl-newlib-only",
"--file-hash", "mac_x86_newlib",
Var("nacl_toolchain_mac_x86_newlib_hash"),
"--file-hash", "win_x86_newlib",
Var("nacl_toolchain_win_x86_newlib_hash"),
"--file-hash", "linux_x86_newlib",
Var("nacl_toolchain_linux_x86_newlib_hash"),
+ "--file-hash", "mac_x86",
+ Var("nacl_toolchain_mac_x86_hash"),
+ "--file-hash", "win_x86",
+ Var("nacl_toolchain_win_x86_hash"),
+ "--file-hash", "linux_x86",
+ Var("nacl_toolchain_linux_x86_hash"),
+ "--save-downloads-dir",
+ "src/native_client_sdk/src/build_tools/toolchain_archives",
],
},
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698