Refactor grit -D flags into a gyp variable so we don't

chrome/chrome.gyp

 # Copyright (c) 2010 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.
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 184 matching lines @@
             # This means you end up with all the outputs from all the grd
             # files, which angers scons and confuses vstudio.
             # One alternative would be to turn this into several actions,
             # but that would be rather verbose.
           ],
           'action': ['<@(grit_cmd)', '-i',
             '<(RULE_INPUT_PATH)',
             'build', '-o', '<(grit_out_dir)',
             '-D', '<(chrome_build)',
             '-E', '<(branded_env)',
-          ],
-          'conditions': [
-            ['chromeos==1', {
-              'action': ['-D', 'chromeos'],
-            }],
-            ['toolkit_views==1', {
-              'action': ['-D', 'toolkit_views'],
-            }],
-            ['use_titlecase_in_grd_files==1', {
-              'action': ['-D', 'use_titlecase'],
-            }],
+            '<@(grit_defines)',
           ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         '<@(chrome_resources_grds)',
         '<@(chrome_resources_inputs)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ skipping 56 matching lines @@
             '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
             # TODO: remove this helper when we have loops in GYP
             '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))',
             # TODO(bradnelson): move to something like this
             #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_strings_grds))',
             # See comment in chrome_resources as to why.
           ],
           'action': ['<@(grit_cmd)', '-i',
                     '<(RULE_INPUT_PATH)',
                     'build', '-o', '<(grit_out_dir)',
-                    '-D', '<(chrome_build)'],
-          'conditions': [
-            ['chromeos==1', {
-              'action': ['-D', 'chromeos'],
-            }],
-            ['use_titlecase_in_grd_files==1', {
-              'action': ['-D', 'use_titlecase'],
-            }],
-          ],
+                    '-D', '<(chrome_build)',
+                    '<@(grit_defines)' ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         '<@(chrome_strings_grds)',
         '<@(chrome_strings_inputs)',
       ],
       'include_dirs': [
         '<(grit_out_dir)',
       ],
@@ skipping 27 matching lines @@
           'inputs': [
             '<!@(<(grit_info_cmd) --inputs <(input_path))',
           ],
           'outputs': [
             '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
           ],
           'action': [
             '<@(grit_cmd)',
             '-i', '<(input_path)', 'build',
             '-o', '<(grit_out_dir)',
-            '-D', '<(chrome_build)'
-          ],
-          'conditions': [
-            ['chromeos==1', {
-              'action': ['-D', 'chromeos'],
-            }],
-            ['toolkit_views==1', {
-              'action': ['-D', 'toolkit_views'],
-            }],
-            ['use_titlecase_in_grd_files==1', {
-              'action': ['-D', 'use_titlecase'],
-            }],
+            '-D', '<(chrome_build)',
+            '<@(grit_defines)',
           ],
           'message': 'Generating resources from <(input_path)',
         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(grit_out_dir)',
         ],
       },
       'conditions': [
@@ skipping 26 matching lines @@
           'inputs': [
             '<!@(<(grit_info_cmd) --inputs <(input_path))',
           ],
           'outputs': [
             '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
           ],
           'action': [
             '<@(grit_cmd)',
             '-i', '<(input_path)', 'build',
             '-o', '<(grit_out_dir)',
-            '-D', '<(chrome_build)'
-          ],
-          'conditions': [
-            ['chromeos==1', {
-              'action': ['-D', 'chromeos'],
-            }],
-            ['use_titlecase_in_grd_files==1', {
-              'action': ['-D', 'use_titlecase'],
-            }],
+            '-D', '<(chrome_build)',
+            '<@(grit_defines)',
           ],
           'message': 'Generating resources from <(input_path)',
         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(grit_out_dir)',
         ],
       },
       'conditions': [
@@ skipping 43 matching lines @@
             # This means you end up with all the outputs from all the grd
             # files, which angers scons and confuses vstudio.
             # One alternative would be to turn this into several actions,
             # but that would be rather verbose.
           ],
           'action': ['<@(grit_cmd)', '-i',
             '<(RULE_INPUT_PATH)',
             'build', '-o', '<(grit_out_dir)',
             '-D', '<(chrome_build)',
             '-E', '<(branded_env)',
-          ],
-          'conditions': [
-            ['chromeos==1', {
-              'action': ['-D', 'chromeos'],
-            }],
-            ['use_titlecase_in_grd_files==1', {
-              'action': ['-D', 'use_titlecase'],
-            }],
-            ['touchui==1', {
-              'action': ['-D', 'touchui'],
-            }],
+            '<@(grit_defines)',
           ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         '<@(chrome_extra_resources_grds)',
         '<@(chrome_extra_resources_inputs)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ skipping 1437 matching lines @@
       }],  # targets
     }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: