Roll gyp r1647:1651

r1648 | scottmg@chromium.org | 2013-06-14 10:08:54 -0700 (Fri, 14 Jun 2013) | 7 lines  fix flock-related tests on linux/mac after r1646  flock not used on ninja now in favour of pool functionality.  R=thakis@chromium.org  Review URL: https://codereview.chromium.org/17055004
r1649 | scottmg@chromium.org | 2013-06-14 10:20:04 -0700 (Fri, 14 Jun 2013) | 9 lines  switch go/gypbot from vs2008 to vs2012  Per https://groups.google.com/forum/?fromgroups#!topic/gyp-developer/OviErZ6vR1A move 2008 to 2012.  R=bradnelson@google.com  Review URL: https://codereview.chromium.org/17035011
r1650 | wfh@chromium.org | 2013-06-17 03:31:30 -0700 (Mon, 17 Jun 2013) | 10 lines  Squelch warnings from gyp where certain exclusion directives are used  When AdditionalDependencies! and DelayLoadDLLs! directives are used e.g. in chrome_dll.gypi, warnings are emitted.  This CL supresses them.  BUG=246570 TEST=build\gyp_chromium with GYP_GENERATORS=msvs, no warnings generated R=scottmg@chromium.org  Review URL: https://codereview.chromium.org/16690005
r1651 | iannucci@chromium.org | 2013-06-17 16:28:43 -0700 (Mon, 17 Jun 2013) | 6 lines  Bump memory per linker to 4 to account for system overhead.  R=scottmg@chromium.org BUG=  Review URL: https://codereview.chromium.org/17121012

R=scottmg@chromium.org
BUG=

Review URL: https://codereview.chromium.org/17339002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207021 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/DEPS b/DEPS
index 4d0714b..dc75150f 100644
--- a/DEPS
+++ b/DEPS
@@ -104,7 +104,7 @@ deps = {
     (Var("googlecode_url") % "grit-i18n") + "/trunk@127",
 
   "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1647",
+    (Var("googlecode_url") % "gyp") + "/trunk@1651",
 
   "src/tools/swarm_client":
     "/trunk/tools/swarm_client@" + Var("swarm_revision"),