summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-29 05:07:11 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-29 05:07:11 +0000
commit4666ba853daf1c4f9456ff70e1313d7bbfa7694e (patch)
treed029e5e63d81abacbfcbef14febc85bc2598967e
parent0d811a4265bbd36a7af8b09920ceb17348832200 (diff)
downloadchromium_src-4666ba853daf1c4f9456ff70e1313d7bbfa7694e.zip
chromium_src-4666ba853daf1c4f9456ff70e1313d7bbfa7694e.tar.gz
chromium_src-4666ba853daf1c4f9456ff70e1313d7bbfa7694e.tar.bz2
Roll GYP 1806:1827
r1827 Write the make_global_settings to the error message. r1826 _XcodeVersion: return CLT version as appropriate r1825 xcode_emulation: fix on CLT-only systems redux r1824 make: Let CC_host, CXX_host env vars win over make_global_settings keys. r1823 Revert r1819 for now, it broke the mac bots. r1822 win ninja: add support for ForceSymbolReferences r1821 Restrict multiple codesign assert. r1820 win msvs: make mixed source/dir match gyp order r1819 xcode_emulation: work in the absence of xcodebuild OS X systems r1818 Add license header to ordered_dict r1817 Fix OrderedDict path import for 2.6 r1816 Add backported OrderedDict r1815 Use gyp.common.EnsureDirExists() in more places. r1814 win ninja: default to embedding manifest to match msvs r1813 win ninja: Refactor manifest generate and embed to be 1-pass r1812 win msvs: Make ordering of sources in subdirs match gyp order r1811 Fix gyptest-xcode-env-order for Xcode 5.0.0 r1810 Fix gyptest-sdkroot when oldest SDK is >= 10.8 r1809 Fix gyptest-xcode-gcc.py when using Xcode 5.0.2 r1808 Fix gyptest-app for Xcode 5.0.2 r1807 win msvs: make ordering match .gyp order R=thakis@chromium.org TBR=thakis Review URL: https://codereview.chromium.org/120213003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242702 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index fa3ca49..a8cccbc 100644
--- a/DEPS
+++ b/DEPS
@@ -132,7 +132,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@141",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1806",
+ (Var("googlecode_url") % "gyp") + "/trunk@1827",
"src/tools/swarming_client":
Var("chromium_git") + "/external/swarming.client.git@" +