summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 02:42:27 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 02:42:27 +0000
commit73aba521e02972d94782502092fd226906dc2b97 (patch)
tree5274f339d0049fba6d8721fc56504473c3a29f15
parent2689f76aca1f632b92fdd1d7be1b4bf06671aa36 (diff)
downloadchromium_src-73aba521e02972d94782502092fd226906dc2b97.zip
chromium_src-73aba521e02972d94782502092fd226906dc2b97.tar.gz
chromium_src-73aba521e02972d94782502092fd226906dc2b97.tar.bz2
Pulling in newer gyp, nacl, and breakpad to bring together stronger gyp warnings
with the fixes needed so we everything will stay green. BUG=None TEST=None Review URL: http://codereview.chromium.org/6128009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71137 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS6
1 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 93423af..293713c 100644
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ vars = {
"skia_revision": "673",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "4085",
+ "nacl_revision": "4113",
"libjingle_revision": "50",
"libvpx_revision": "65287",
"ffmpeg_revision": "70984",
@@ -16,7 +16,7 @@ vars = {
deps = {
"src/breakpad/src":
- (Var("googlecode_url") % "google-breakpad") + "/trunk/src@734",
+ (Var("googlecode_url") % "google-breakpad") + "/trunk/src@753",
"src/build/util/support":
"/trunk/deps/support@20411",
@@ -55,7 +55,7 @@ deps = {
(Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@67",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@857",
+ (Var("googlecode_url") % "gyp") + "/trunk@874",
"src/v8":
(Var("googlecode_url") % "v8") + "/trunk@6238",