diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 00:00:12 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 00:00:12 +0000 |
| commit | e0bf6cfd9a6aec93a087a43025f894438a953540 (patch) | |
| tree | 34bd9149ff761b1d1a8b4f9e0efe7807fbd7eadc | |
| parent | 83e88ed6e8392d79c48fc089fe6a1afec16aeebd (diff) | |
| download | chromium_src-e0bf6cfd9a6aec93a087a43025f894438a953540.zip chromium_src-e0bf6cfd9a6aec93a087a43025f894438a953540.tar.gz chromium_src-e0bf6cfd9a6aec93a087a43025f894438a953540.tar.bz2 | |
Roll gyp DEPS r1055:1064. This picks up:
r1055 - make: Don't let make_global_settings refer to the no longer existing $FLOCK
r1056 - Fix the issue that the forced include is ignored for .c files
r1057 - Make GYP print a warning when it includes include.gypi.
r1058 - Fixing mismatch between test and result introduced in r1057.
r1059 - Error when ProgramDataBaseFileName set in gyp.
r1060 - VCLibrarianTool LinkTimeCodeGeneration causing warning.
r1061 - Gyp files as source creates issue when not in directory for generated project files.
r1062 - Properly build/bundle mac_bundle=1 and type=loadable_module targets when using Mac Make.
r1063 - Mac Make: Only create PkgInfo files for target type=executable.
r1064 - Remove unused assertion in make.py XcodeSettings.GetBundlePlistPath()
BUG=90183,98880
TEST=none
TBR=mark@chromium.org
Review URL: http://codereview.chromium.org/8124009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103820 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -98,7 +98,7 @@ deps = { (Var("googlecode_url") % "grit-i18n") + "/trunk@5", "src/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@1055", + (Var("googlecode_url") % "gyp") + "/trunk@1064", "src/v8": (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), |