diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:53:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:53:05 +0000 |
| commit | 93c81adfc4520ddd81c053b2f2c1ae63e45ee782 (patch) | |
| tree | 62dd33d1c8367931bc2838927fa7b454f4d89ed5 /DEPS | |
| parent | 7f8b8ea33b9e3ddd9107ee6cbb0a47061daf1904 (diff) | |
| download | chromium_src-93c81adfc4520ddd81c053b2f2c1ae63e45ee782.zip chromium_src-93c81adfc4520ddd81c053b2f2c1ae63e45ee782.tar.gz chromium_src-93c81adfc4520ddd81c053b2f2c1ae63e45ee782.tar.bz2 | |
Roll gyp 1107:1115
1108: Preventing dependency on a static library from traversing a none target,
unless the none target is marked with 'dependencies_traverse': 1,
1109: Edited wiki page.
1110: Move GetFlavor() to gyp.common.
1111: Add the 'flavor' concept to the ninja generator.
1112: Let ninja/mac pass all gyp tests. (it's still unusable though, most tests
are just disabled for now.)
1113: Turning on ninja tests for gypbots.
1114: Temporarily switch dependencies_traverse to default to on.
1115: Merge the current upstream version of ninja_syntax.py
BUG=none
TEST=none
TBR=bradn
Review URL: http://codereview.chromium.org/9020002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -103,7 +103,7 @@ deps = { (Var("googlecode_url") % "grit-i18n") + "/trunk@9", "src/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@1107", + (Var("googlecode_url") % "gyp") + "/trunk@1115", "src/v8": (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), |