diff options
| author | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 18:31:33 +0000 |
|---|---|---|
| committer | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 18:31:33 +0000 |
| commit | 57bd6676c07a4b87563f3268a062aabaed10a5cb (patch) | |
| tree | e626e3fa8dfc1e71431ec6b2cc1b75e487c1fe37 /build | |
| parent | e676e68168eba9e07928d453e4ba644075d86089 (diff) | |
| download | chromium_src-57bd6676c07a4b87563f3268a062aabaed10a5cb.zip chromium_src-57bd6676c07a4b87563f3268a062aabaed10a5cb.tar.gz chromium_src-57bd6676c07a4b87563f3268a062aabaed10a5cb.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/grit_action.gypi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build/grit_action.gypi b/build/grit_action.gypi index ee2de07..9d078b4 100644 --- a/build/grit_action.gypi +++ b/build/grit_action.gypi @@ -1,4 +1,4 @@ -# 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 # found in the LICENSE file. @@ -25,11 +25,8 @@ ], 'action': ['<@(grit_cmd)', '-i', '<(grit_grd_file)', 'build', - # Combine the -f with the path to avoid gyp reinterpreting the path - # in terms of msvs' path structure. - '-fGRIT_DIR/../gritsettings/resource_ids', + '-f', 'GRIT_DIR/../gritsettings/resource_ids', '-o', '<(grit_out_dir)', '<@(grit_defines)' ], - 'msvs_cygwin_shell': 0, 'message': 'Generating resources from <(grit_grd_file)', } |