From 1138e11079c582d1a01c8b77b808760c9c0c205c Mon Sep 17 00:00:00 2001 From: thakis Date: Tue, 25 Nov 2014 00:46:32 -0800 Subject: [PATCH] roll gyp 1994:2008 0a381c0 ninja/win: Let link-wrapper convert /s to \s in the linker command. by thakis@chromium.org 4621f4d Initialize struct flock for AIX with O_LARGEFILE used by Python. by thakis@chromium.org acf3295 Add back support for /Gv now that gyp-win64 has VS2013 by sbaig1@bloomberg.net 66b3c80 Mechanical changes to cleanup pylint presubmit checks by sbaig1@bloomberg.net fb8a7bd Add support for "else if" in gyp conditions by sbaig1@bloomberg.net 0131ede ninja win: Add msvs emulation for FloatingPointModel by sbaig1@bloomberg.net addc5ea win: Use the _winreg module for registry access by sbaig1@bloomberg.net f1c42f7 Revert r1998, it breaks iOS builds by thakis@chromium.org 9c58d52 Fix dependency broken on mac when building FAT binaries. by thakis@chromium.org cb9f256 ninja win: Don't return unfound VS version, raise instead by sbaig1@bloomberg.net 487c0b6 Set ZERO_AR_DATE=1 when running libtool. by maruel@chromium.org f491c0b msvs: Fix rule dependencies for VS2013 by sbaig1@bloomberg.net 723d919 Switch to 2013 now that it's what's on the bots by scottmg@chromium.org a83e5ac Add indentation offset guess for gyp emacs mode. by thakis@chromium.org BUG=436277,... TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/736133007 Cr-Commit-Position: refs/heads/master@{#305606} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 3976ea75dcd5..c2a8fcd1f0ea 100644 --- a/DEPS +++ b/DEPS @@ -169,7 +169,7 @@ deps = { Var('chromium_git') + '/external/grit-i18n.git' + '@' + 'a24a0e647bb718b3540db89864cf586b12331e82', # from svn revision 182 'src/tools/gyp': - Var('chromium_git') + '/external/gyp.git' + '@' + 'b13d8f243da15ded051e87e663c4f2c2fcc5804c', # from svn revision 1994 + Var('chromium_git') + '/external/gyp.git' + '@' + '0a381c067483f37d7344b36110b31c9b14998ed1', # from svn revision 2008 'src/tools/swarming_client': Var('chromium_git') + '/external/swarming.client.git' + '@' + Var('swarming_revision'), -- 2.11.4.GIT