Skip to content

Commit

Permalink
roll gyp 1212:1223
Browse files Browse the repository at this point in the history
1213: ninja: Add a normpath() call, fix copy rules on windows
1214: ninja: Fix test/product broken at r1211 (also fixes crbug.com/115049)
1215: ninja: Fix quoting shell args on Windows
1216: make action_dependencies test win32 and c89 friendly (test-only)
1217: Revert normpath() part of r1213
1218: Quote arguments properly in rules for cmd on Windows ninja.
1219: ninja/win: Fix obj extension for test/ninja/chained-dependency (test-only)
1220: Exclude test/assembly on Windows (test-only)
1221: ninja/win: Allow override of OS variable on Windows ninja.
1222: Fix indent on test code for test/assembly broken in r1220 (test-only)
1223: mac ninja&make: Filter out useless 'This view is clipping its content' message.

BUG=115049
TEST=`ninja All` starts building
TBR=scottmg

Review URL: http://codereview.chromium.org/9431006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122922 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thakis@chromium.org committed Feb 22, 2012
1 parent 8418ed0 commit bfc95a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@9",

"src/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@1212",
(Var("googlecode_url") % "gyp") + "/trunk@1222",

"src/v8":
(Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
Expand Down

0 comments on commit bfc95a9

Please sign in to comment.