diff options
| author | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 19:41:51 +0000 |
|---|---|---|
| committer | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 19:41:51 +0000 |
| commit | 77f846c6497cdce04e9f6701e478d46a0c358853 (patch) | |
| tree | 231992fbf06c03615c5299e2ac93dfbaa7c5dbd6 /build/grit_action.gypi | |
| parent | 6172089d610e92345a897c9bb05f7f8c7279d39b (diff) | |
| download | chromium_src-77f846c6497cdce04e9f6701e478d46a0c358853.zip chromium_src-77f846c6497cdce04e9f6701e478d46a0c358853.tar.gz chromium_src-77f846c6497cdce04e9f6701e478d46a0c358853.tar.bz2 | |
Remove cygwin disease from grit (python) invocations :)
R=scottmg,joi
BUG=123026
Review URL: https://chromiumcodereview.appspot.com/10832121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/grit_action.gypi')
| -rw-r--r-- | build/grit_action.gypi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/grit_action.gypi b/build/grit_action.gypi index 9d078b4..ee2de07 100644 --- a/build/grit_action.gypi +++ b/build/grit_action.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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,8 +25,11 @@ ], 'action': ['<@(grit_cmd)', '-i', '<(grit_grd_file)', 'build', - '-f', 'GRIT_DIR/../gritsettings/resource_ids', + # Combine the -f with the path to avoid gyp reinterpreting the path + # in terms of msvs' path structure. + '-fGRIT_DIR/../gritsettings/resource_ids', '-o', '<(grit_out_dir)', '<@(grit_defines)' ], + 'msvs_cygwin_shell': 0, 'message': 'Generating resources from <(grit_grd_file)', } |