summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-31 01:47:38 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-31 01:47:38 +0000
commit52cc57aa13a90fef856ffbb123c715a4a3af13fa (patch)
tree63f31f55c9334a4b6c85fb3229e99f28c051338a /DEPS
parent0ec4898e0384bdcd499a9fb27d66d7e226788cef (diff)
downloadchromium_src-52cc57aa13a90fef856ffbb123c715a4a3af13fa.zip
chromium_src-52cc57aa13a90fef856ffbb123c715a4a3af13fa.tar.gz
chromium_src-52cc57aa13a90fef856ffbb123c715a4a3af13fa.tar.bz2
roll gyp 1119:1121
1120: ninja/mac: Copy the global xcode_settings to targets. 1121: ninja/mac: Pass frameworks in 'libraries' through the -framework switch. 1122: ninja/mac: Add a temporary gnarly hack to let ninja parse chromium's build files. BUG=96894 TEST=none TBR=mark@chromium.org Review URL: http://codereview.chromium.org/8974032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116053 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 1cdf7aa..66677cf 100644
--- a/DEPS
+++ b/DEPS
@@ -103,7 +103,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@9",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1119",
+ (Var("googlecode_url") % "gyp") + "/trunk@1122",
"src/v8":
(Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),