summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 12:17:40 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 12:17:40 +0000
commit4d85ac4760d88afacd9cef367420585e1342a594 (patch)
treec224681f0293fdbe9a567eb81827b6b064116095 /DEPS
parent5844c2b8dc66ab9a489966631d00ffce5bb6ad14 (diff)
downloadchromium_src-4d85ac4760d88afacd9cef367420585e1342a594.zip
chromium_src-4d85ac4760d88afacd9cef367420585e1342a594.tar.gz
chromium_src-4d85ac4760d88afacd9cef367420585e1342a594.tar.bz2
Roll gyp deps 1535:1537
1536 - Support VCCLCompilerTool/ForcedIncludeFiles in msvs_emulator. 1537 - Enforce unique basenames within each individual target for shared and static libraries BUG=162859 TEST=none R=bauerb@chromium.org Review URL: https://codereview.chromium.org/11416233 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169906 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 2311ed8..105b954 100644
--- a/DEPS
+++ b/DEPS
@@ -103,7 +103,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@86",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1535",
+ (Var("googlecode_url") % "gyp") + "/trunk@1537",
"src/tools/swarm_client":
"/trunk/tools/swarm_client@169278",