Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1067)

Unified Diff: app/app.gyp

Issue 6070011: Refactor grit -D flags into a gyp variable so we don't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: works Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/app.gyp
diff --git a/app/app.gyp b/app/app.gyp
index bac326b5828d455832c8c582e4af67399c1e763a..dca58a91550ef5f062bd747bb8b88b86a0d68d60 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -109,16 +109,9 @@
'>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))',
],
'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)',
- 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)'],
+ 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)',
+ '<@(grit_defines)'],
'message': 'Generating resources from <(RULE_INPUT_PATH)',
- 'conditions': [
- ['use_titlecase_in_grd_files==1', {
- 'action': ['-D', 'use_titlecase'],
- }],
- ['chromeos==1', {
- 'action': ['-D', 'chromeos'],
- }],
- ],
},
],
'sources': [
@@ -154,12 +147,8 @@
],
'action': ['<@(grit_cmd)',
'-i', '<(input_path)', 'build',
- '-o', '<(grit_out_dir)/app_resources'],
- 'conditions': [
- ['toolkit_views==1', {
- 'action': ['-D', 'toolkit_views'],
- }],
- ],
+ '-o', '<(grit_out_dir)/app_resources',
+ '<@(grit_defines)' ],
'message': 'Generating resources from <(input_path)',
},
],
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698