diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 23:20:35 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 23:20:35 +0000 |
| commit | 230f1e8d40fc3b1788fd58f8b2154799208aba67 (patch) | |
| tree | 0a8dad3f1a35ea6de885424a891a9de9847c57af /content/browser/tracing/tracing_resources.gyp | |
| parent | 7c3befe537a84fb0b4dddb9536d353866f89a5a8 (diff) | |
| download | chromium_src-230f1e8d40fc3b1788fd58f8b2154799208aba67.zip chromium_src-230f1e8d40fc3b1788fd58f8b2154799208aba67.tar.gz chromium_src-230f1e8d40fc3b1788fd58f8b2154799208aba67.tar.bz2 | |
Port r152639 and r177025 to tracing_ and devtools_resources.gyp.
Gets rid of two msvs_cygwin_shell=1.
Also remove a bunch of msvs_cygwin_shell=0s -- this is now the default and
doesn't have to be set explicitly any more.
BUG=123026
R=cpu@chromium.org
TBR=jam
Review URL: https://codereview.chromium.org/140493003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tracing/tracing_resources.gyp')
| -rw-r--r-- | content/browser/tracing/tracing_resources.gyp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/tracing/tracing_resources.gyp b/content/browser/tracing/tracing_resources.gyp index f5ea3e2..0684575 100644 --- a/content/browser/tracing/tracing_resources.gyp +++ b/content/browser/tracing/tracing_resources.gyp @@ -66,12 +66,11 @@ ], 'action': ['<@(grit_cmd)', '-i', '<(grit_grd_file)', 'build', - '-f', 'GRIT_DIR/../gritsettings/resource_ids', + '-f', '<(DEPTH)/tools/gritsettings/resource_ids', '-o', '<(grit_out_dir)', '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)', '<@(grit_defines)' ], 'message': 'Generating resources from <(grit_grd_file)', - 'msvs_cygwin_shell': 1, } ], 'includes': [ '../../../build/grit_target.gypi' ] |