summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-24 19:18:36 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-24 19:18:36 +0000
commit422537de9822bdf52c242a98c2a095e18f4bd46d (patch)
tree5d591dc4662942a9fbd45981a78fae73d4903e49 /DEPS
parentb831167198ed494649ee5b83481dbf249a709408 (diff)
downloadchromium_src-422537de9822bdf52c242a98c2a095e18f4bd46d.zip
chromium_src-422537de9822bdf52c242a98c2a095e18f4bd46d.tar.gz
chromium_src-422537de9822bdf52c242a98c2a095e18f4bd46d.tar.bz2
Roll gyp 1098:1101
1099: make: Make INTERMEDIATE_DIR not shared between targets. 1100: make: Allow override of default target. 1101: make: Revert a part of 1099 that didn't really add anything other than breaking the chrome build. BUG=103273 TEST=none TBR=dhollowa Review URL: http://codereview.chromium.org/8694004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 611f8ac..5ff112a 100644
--- a/DEPS
+++ b/DEPS
@@ -95,7 +95,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@7",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1098",
+ (Var("googlecode_url") % "gyp") + "/trunk@1101",
"src/v8":
(Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),