First attempt at cleaning up chrome_resources.gyp.

chrome/chrome_resources.gyp

 # Copyright (c) 2012 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': {
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
     'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
     'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.js',
   },
   'targets': [
     {
       'target_name': 'chrome_extra_resources',
       'type': 'none',
       # These resources end up in resources.pak because they are resources
       # used by internal pages.  Putting them in a separate pak file makes
       # it easier for us to reference them internally.
       'actions': [
         {
-          'action_name': 'memory_internals_resources',
+          'action_name': 'generate_memory_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/memory_internals_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'net_internals_resources',
+          'action_name': 'generate_net_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/net_internals_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'invalidations_resources',
+          'action_name': 'generate_invalidations_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/invalidations_resources.grd',
             },
           'includes': ['../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'password_manager_internals_resources',
+          'action_name': 'generate_password_manager_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/password_manager_internals_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'signin_internals_resources',
+          'action_name': 'generate_signin_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/signin_internals_resources.grd',
             },
           'includes': ['../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'sync_internals_resources',
+          'action_name': 'generate_sync_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/sync_internals_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'translate_internals_resources',
+          'action_name': 'generate_translate_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/translate_internals_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
             '../components/components_resources.gyp:components_resources',
             '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
             '../content/browser/tracing/tracing_resources.gyp:tracing_resources',
           ],
           'actions': [
             {
-              'action_name': 'component_extension_resources',
+              'action_name': 'generate_component_extension_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/component_extension_resources.grd',
               },
               'includes': [ '../build/grit_action.gypi' ],
             },
             {
-              'action_name': 'options_resources',
+              'action_name': 'generate_options_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/options_resources.grd',
               },
               'includes': [ '../build/grit_action.gypi' ],
             },
             {
-              'action_name': 'quota_internals_resources',
+              'action_name': 'generate_quota_internals_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/quota_internals_resources.grd',
               },
               'includes': [ '../build/grit_action.gypi' ],
             },
             {
-              'action_name': 'sync_file_system_internals_resources',
+              'action_name': 'generate_sync_file_system_internals_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/sync_file_system_internals_resources.grd',
               },
               'includes': [ '../build/grit_action.gypi' ],
             },
           ],
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)/resources/extension/demo',
               'files': [
@@ skipping 17 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'chrome_internal_resources_gen',
       'type': 'none',
       'conditions': [
         ['branding=="Chrome"', {
           'actions': [
             {
-              'action_name': 'transform_additional_modules_list',
+              'action_name': 'generate_transform_additional_modules_list',
               'variables': {
                 'additional_modules_input_path':
                   'browser/internal/resources/additional_modules_list.input',
                 'additional_modules_py_path':
                   'browser/internal/transform_additional_modules_list.py',
               },
               'inputs': [
                 '<(additional_modules_input_path)',
               ],
               'outputs': [
@@ skipping 17 matching lines @@
       # of the static libraries currently have circular dependencies among
       # generated headers.
       'target_name': 'chrome_resources',
       'type': 'none',
       'dependencies': [
         'about_credits',
         'chrome_internal_resources_gen',
         'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
       ],
       'actions': [
-        # Data resources.
         {
-          'action_name': 'browser_resources',
+          'action_name': 'generate_browser_resources',
           'variables': {
             'grit_grd_file': 'browser/browser_resources.grd',
             'grit_additional_defines': [
               '-E', 'about_credits_file=<(about_credits_file)',
               '-E', 'additional_modules_list_file=<(additional_modules_list_file)',
               '-E', 'omnibox_mojom_file=<(omnibox_mojom_file)',
             ],
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'common_resources',
+          'action_name': 'generate_common_resources',
           'variables': {
             'grit_grd_file': 'common/common_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'renderer_resources',
+          'action_name': 'generate_renderer_resources',
           'variables': {
             'grit_grd_file': 'renderer/resources/renderer_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'conditions': [
         ['enable_extensions==1', {
           'actions': [
             {
-              'action_name': 'extensions_api_resources',
+              'action_name': 'generate_extensions_api_resources',
               'variables': {
                 'grit_grd_file': 'common/extensions_api_resources.grd',
               },
               'includes': [ '../build/grit_action.gypi' ],
             }
           ],
         }],
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
       'target_name': 'chrome_strings',
       'type': 'none',
       'actions': [
-        # Localizable resources.
         {
-          'action_name': 'locale_settings',
+          'action_name': 'generate_locale_settings',
           'variables': {
             'grit_grd_file': 'app/resources/locale_settings.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'chromium_strings.grd',
+          'action_name': 'generate_chromium_strings',
           'variables': {
             'grit_grd_file': 'app/chromium_strings.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'generated_resources',
+          'action_name': 'generate_generated_resources',
           'variables': {
             'grit_grd_file': 'app/generated_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'google_chrome_strings',
+          'action_name': 'generate_google_chrome_strings',
           'variables': {
             'grit_grd_file': 'app/google_chrome_strings.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       'target_name': 'chrome_strings_map',
@@ skipping 50 matching lines @@
                 'app/resources/locale_settings_linux.grd',
           },],
           ['OS == "mac" or OS == "ios"', {
             'platform_locale_settings_grd':
                 'app/resources/locale_settings_mac.grd',
           }],
         ],  # conditions
       },  # variables
       'actions': [
         {
-          'action_name': 'platform_locale_settings',
+          'action_name': 'generate_platform_locale_settings',
           'variables': {
             'grit_grd_file': '<(platform_locale_settings_grd)',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'theme_resources_gen',
+      'target_name': 'theme_resources',
       'type': 'none',
+      'dependencies': [
+        '../ui/resources/ui_resources.gyp:ui_resources',
+        'chrome_unscaled_resources',
+      ],
       'actions': [
         {
-          'action_name': 'theme_resources',
+          'action_name': 'generate_theme_resources',
           'variables': {
             'grit_grd_file': 'app/theme/theme_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'theme_resources',
-      'type': 'none',
-      'dependencies': [
-        'chrome_unscaled_resources',
-        'theme_resources_gen',
-        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
-      ],
-    },
-    {
       'target_name': 'packed_extra_resources',
       'type': 'none',
       'dependencies': [
         'chrome_extra_resources',
         'packed_resources',
       ],
       'actions': [
         {
           'includes': ['chrome_repack_resources.gypi']
         },
@@ skipping 125 matching lines @@
                 },
               ],
             }],
           ], # conditions
         }], # end OS != "mac" and OS != "ios"
       ], # conditions
     },
     {
       'target_name': 'chrome_unscaled_resources',
       'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
-      },
       'actions': [
         {
-          'action_name': 'chrome_unscaled_resources',
+          'action_name': 'generate_chrome_unscaled_resources',
           'variables': {
             'grit_grd_file': 'app/theme/chrome_unscaled_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       'target_name': 'about_credits',
@@ skipping 16 matching lines @@
                      '<(generator_path)',
                      'credits',
                      '<(about_credits_file)',
           ],
           'message': 'Generating about:credits',
         },
       ],
     },
   ], # targets
 }