Commit 57bd6676 authored by scottmg@google.com's avatar scottmg@google.com

Revert 149892 - Remove cygwin disease from grit (python) invocations :)

(Try bots currently failing on pak build. Not sure that this is the cause, but
I don't see a lot of other plausible candidates. I'll revert this revert if it
doesn't help.)

R=scottmg,joi
BUG=123026

Review URL: https://chromiumcodereview.appspot.com/10832121

TBR=iannucci@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10834182

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150118 0039d316-1c4b-4281-b951-d872f2087c98
parent e676e681
# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
...@@ -25,11 +25,8 @@ ...@@ -25,11 +25,8 @@
], ],
'action': ['<@(grit_cmd)', 'action': ['<@(grit_cmd)',
'-i', '<(grit_grd_file)', 'build', '-i', '<(grit_grd_file)', 'build',
# Combine the -f with the path to avoid gyp reinterpreting the path '-f', 'GRIT_DIR/../gritsettings/resource_ids',
# in terms of msvs' path structure.
'-fGRIT_DIR/../gritsettings/resource_ids',
'-o', '<(grit_out_dir)', '-o', '<(grit_out_dir)',
'<@(grit_defines)' ], '<@(grit_defines)' ],
'msvs_cygwin_shell': 0,
'message': 'Generating resources from <(grit_grd_file)', 'message': 'Generating resources from <(grit_grd_file)',
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment