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

Unified Diff: DEPS

Issue 7750001: Pulling new nacl into chrome, which now uses a single ppapi copy. (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 98186)
+++ DEPS (working copy)
@@ -7,12 +7,11 @@
"webkit_revision": "93705",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "6499",
+ "nacl_revision": "6539",
# 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": "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.
@@ -102,11 +101,6 @@
"src/native_client":
Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
- "src/native_client/src/third_party/ppapi":
- # TODO(brettw) enable the From() line instead when checkdeps is fixed.
- #From("src/native_client", "native_client/src/third_party/ppapi"),
- "/trunk/src/ppapi@" + Var("nacl_chrome_ppapi_revision"),
-
"src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin":
Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
Var("nacl_revision"),
« 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