From bb6aba3a90b104b7df841f15d00f6f31d580ac71 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Fri, 7 Jan 2011 19:04:43 +0000 Subject: 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 --- chrome/default_plugin/default_plugin.gyp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'chrome/default_plugin') 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)', }, ], -- cgit v1.1