summaryrefslogtreecommitdiffstats
path: root/chrome/default_plugin
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 19:04:43 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 19:04:43 +0000
commitbb6aba3a90b104b7df841f15d00f6f31d580ac71 (patch)
tree3e1ab96bcaaf9114acc6907f99de2fe1095c6ec8 /chrome/default_plugin
parent674731cacddac05a7ddf1f333defe22bb5be8e1b (diff)
downloadchromium_src-bb6aba3a90b104b7df841f15d00f6f31d580ac71.zip
chromium_src-bb6aba3a90b104b7df841f15d00f6f31d580ac71.tar.gz
chromium_src-bb6aba3a90b104b7df841f15d00f6f31d580ac71.tar.bz2
Refactor grit -D flags into a gyp variable so we don't
have to repeat the logic for it in a bunch of different places. I had to add another level of variables{} so I could use use_titlecase_in_grd_files in a condition. I also removed some quotes around default values since that seems to be the more common way to express boolean values. BUG=68028 Review URL: http://codereview.chromium.org/6070011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin')
-rw-r--r--chrome/default_plugin/default_plugin.gyp8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp
index a0d8a6d..e82f15e 100644
--- a/chrome/default_plugin/default_plugin.gyp
+++ b/chrome/default_plugin/default_plugin.gyp
@@ -79,12 +79,8 @@
],
'action': ['<@(grit_cmd)',
'-i', '<(input_path)', 'build',
- '-o', '<(grit_out_dir)/default_plugin_resources'],
- 'conditions': [
- ['toolkit_views==1', {
- 'action': ['-D', 'toolkit_views'],
- }],
- ],
+ '-o', '<(grit_out_dir)/default_plugin_resources',
+ '<@(grit_defines)'],
'message': 'Generating resources from <(input_path)',
},
],