summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 23:22:07 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 23:22:07 +0000
commitff5e0a5b0914a4423bbde5fc4e5d9d0f017e542b (patch)
tree44e4e4ec0b727e4a9fb604189f37463e1c16d582 /DEPS
parent1d1faeb02b084613a01a197da689e9f3dd1704cd (diff)
downloadchromium_src-ff5e0a5b0914a4423bbde5fc4e5d9d0f017e542b.zip
chromium_src-ff5e0a5b0914a4423bbde5fc4e5d9d0f017e542b.tar.gz
chromium_src-ff5e0a5b0914a4423bbde5fc4e5d9d0f017e542b.tar.bz2
Revert 240790 "roll gyp 1806:1816"
2.6 code fails. > roll gyp 1806:1816 > > r1807 win msvs: make ordering match .gyp order > r1808 Fix gyptest-app for Xcode 5.0.2 > r1809 Fix gyptest-xcode-gcc.py when using Xcode 5.0.2 > r1810 Fix gyptest-sdkroot when oldest SDK is >= 10.8 > r1811 Fix gyptest-xcode-env-order for Xcode 5.0.0 > r1812 win msvs: Make ordering of sources in subdir > r1813 win ninja: Refactor manifest generate and embed to be 1-pass > r1814 win ninja: default to embedding manifest to match msvs > r1815 Use gyp.common.EnsureDirExists in more places. > r1816 Add backported OrderedDict > > TBR=thakis@chromium.org > BUG=324863,276953,326030 > > Review URL: https://codereview.chromium.org/109223004 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/115513004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240793 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 5bb5b01..4c50d1b 100644
--- a/DEPS
+++ b/DEPS
@@ -119,7 +119,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@140",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1816",
+ (Var("googlecode_url") % "gyp") + "/trunk@1806",
"src/tools/swarming_client":
Var("chromium_git") + "/external/swarming.client.git@" +