summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-24 02:26:59 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-24 02:26:59 +0000
commite7c1a4881b92004cc0ec86720ee38b1a5693fbc7 (patch)
treea3b730ba956a8eb9db36285d915e2b6176331eab
parentebf44f11859ce520a9541cdb436b4b2589ef2e73 (diff)
downloadchromium_src-e7c1a4881b92004cc0ec86720ee38b1a5693fbc7.zip
chromium_src-e7c1a4881b92004cc0ec86720ee38b1a5693fbc7.tar.gz
chromium_src-e7c1a4881b92004cc0ec86720ee38b1a5693fbc7.tar.bz2
roll gyp 1053:1055
1054: ninja: use same loadable_module/shared_library link split as make 1955: make: Don't let make_global_settings refer to the no longer existing $FLOCK BUG=97849 TEST=none TBR=evan Review URL: http://codereview.chromium.org/8038007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102639 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index a7b0473..f3ca5d6 100644
--- a/DEPS
+++ b/DEPS
@@ -98,7 +98,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@5",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1053",
+ (Var("googlecode_url") % "gyp") + "/trunk@1055",
"src/v8":
(Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),