summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-05 05:20:44 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-05 05:20:44 +0000
commit71f23ecde86e536a05b0d244afd5646868ef919e (patch)
tree08a8480c6ed7b5502f5bc2183bdb3ed16c7d1b40
parent55fa1778fab38fb7617968c3bf36ae14ff74de1b (diff)
downloadchromium_src-71f23ecde86e536a05b0d244afd5646868ef919e.zip
chromium_src-71f23ecde86e536a05b0d244afd5646868ef919e.tar.gz
chromium_src-71f23ecde86e536a05b0d244afd5646868ef919e.tar.bz2
roll gyp 1735:1750
r1736 remove ez_setup import from setup.py r1737 ninja/mac: Allow per configuration SDKROOT. r1738 ninja/mac: Fix _XcodeVersion parsing for Xcode 3.2. r1739 Let eclipse generator use MSVS compiler flags on Windows. r1740 Add support for DisableSpecificWarnings for ninja r1741 make: Add AIX support. r1742 Add AIX to platforms that use "make" in gyptest.py r1743 homogenize msvs and ninja library_dir and libraries settings for Windows r1744 Revert homogenize msvs and ninja library_dir and libraries settings r1745 Add an option to prune targets r1746 Revert r1745: "Add an option to prune targets" r1747 Refactor calculation of variables, common to many generators. r1748 ninja/mac: Create -iphoneos device builds for iOS ninja generator. r1749 Avoid MSB8012 on Windows r1750 reland r1743 with reverted test case R=thakis@chromium.org BUG= Review URL: https://codereview.chromium.org/25786004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227185 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 5194816..9cc8972 100644
--- a/DEPS
+++ b/DEPS
@@ -104,7 +104,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@136",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1735",
+ (Var("googlecode_url") % "gyp") + "/trunk@1750",
"src/tools/swarm_client":
"/trunk/tools/swarm_client@" + Var("swarm_revision"),