Standardize grit invokes

chrome/app/policy/policy_templates.gypi

Index: chrome/app/policy/policy_templates.gypi
===================================================================
--- chrome/app/policy/policy_templates.gypi	(revision 79397)
+++ chrome/app/policy/policy_templates.gypi	(working copy)
@@ -12,56 +12,26 @@
           'target_name': 'policy_templates',
           'type': 'none',
           'variables': {
-            'grd_path': 'policy_templates.grd',
-            'template_files': [
-              '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(grd_path))'
-            ],
+            'grit_grd_file': 'policy_templates.grd',
+            'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py',
+                              '<@(grit_defines)'],
           },
+          # Grit target boiler plate.
+          'includes': [ '../../../build/grit_target.gypi' ],

[tony, 2011/03/25 18:07:04]

Can we use <(DEPTH)?

[TVL, 2011/03/25 18:15:53]

Nope, includes happen before variable expansion.

           'actions': [
             {
               'action_name': 'policy_templates',
-              'variables': {
-                'conditions': [
-                  ['branding=="Chrome"', {
-                    # TODO(mmoss) The .grd files look for _google_chrome, but
-                    # for consistency they should look for GOOGLE_CHROME_BUILD
-                    # like C++.
-                    # Clean this up when Windows moves to gyp.
-                    'chrome_build': '_google_chrome',
-                  }, {  # else: branding!="Chrome"
-                    'chrome_build': '_chromium',
-                  }],
-                ],
-              },
-              'inputs': [
-                '<!@(<(grit_info_cmd) --inputs <(grd_path))',
-              ],
-              'outputs': [
-                '<@(template_files)'
-              ],
-              'action': [
-                '<@(grit_cmd)',
-                '-i', '<(grd_path)', 'build',
-                '-o', '<(grit_out_dir)',
-                '<@(grit_defines)',
-              ],
-              'conditions': [
-                ['OS == "mac"', {
-                  'action': ['-D', 'mac_bundle_id=<(mac_bundle_id)'],
-                }],
-              ],
-              'message': 'Generating policy templates from <(grd_path)',
+              # Grit action boiler plate.
+              'includes': [ '../../../build/grit_action.gypi' ],
             },
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(grit_out_dir)',
-            ],
-          },
           'conditions': [
             ['OS=="win"', {
               'variables': {
                 'version_path': '<(grit_out_dir)/app/policy/VERSION',
+                'template_files': [
+                  '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(grit_grd_file))'
+                ],
               },
               'actions': [
                 {
@@ -98,10 +68,7 @@
                 }
               ]
             }],
-            ['OS=="win"', {
-              'dependencies': ['../build/win/system.gyp:cygwin'],
-            }],
-          ],
+          ],  # conditions
         },
       ],  # 'targets'
     }],  # OS=="win" or OS=="mac" or OS=="linux"