Add a wrapper for grit_action.gypi for chrome specific variables.

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.
 {
-  'includes': [
-    'chrome_features.gypi',
-  ],
   'variables': {
-    # Apply Chrome-specific grit settings to all grit actions in this file.
+    # Apply Chrome-specific grit settings to all of this file.
+    # The advantage is that one entry here applies to the entire file.
+    # The caveat is these variables cannot be merged with other variable
+    # dictionaries in more inner scopes. If the variable should be merged,
+    # consider putting them in a gypi file and including it at the right scope
+    # instead. e.g. with chrome_grit_action.gypi.
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
-    'grit_additional_defines': [ '<@(chrome_grit_defines)' ],
-
     'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',

[Dan Beam, 2016/01/04 19:11:22]

I assume brettw@ did not add these with his chrome_features CL, but should these
be in chrome/chrome_grit_action.gypi?

[Lei Zhang, 2016/01/04 19:15:49]

I didn't want chrome_internal_resources_gen to have to include
chrome_grit_action.gypi, since it's not a grit action.

   },
   'targets': [
     {
       # GN version: //chrome:extra_resources
       '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': [
         {
           # GN version: //chrome/browser/resources:memory_internals_resources
           'action_name': 'generate_memory_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/memory_internals_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],

[Dan Beam, 2016/01/04 19:11:22]

i suppose chrome/grit_action.gypi is too easily confused with
build/grit_action.gypi?

[Lei Zhang, 2016/01/04 19:15:49]

It doesn't matter to me. I just wanted a unique identifier to make it easier to
search for.

         },
         {
           # GN version: //chrome/browser/resources:net_internals_resources
           'action_name': 'generate_net_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/net_internals_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/browser/resources:invalidations_resources
           'action_name': 'generate_invalidations_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/invalidations_resources.grd',
             },
-          'includes': ['../build/grit_action.gypi' ],
+          'includes': ['chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/browser/resources: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' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/browser/resources:policy_resources
           'action_name': 'generate_policy_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/md_policy/policy_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/browser/resources:signin_internals_resources
           'action_name': 'generate_signin_internals_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/signin_internals_resources.grd',
             },
-          'includes': ['../build/grit_action.gypi' ],
+          'includes': ['chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/browser/resources: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': [ 'chrome_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',
             'browser/devtools/webrtc_device_provider_resources.gyp:webrtc_device_provider_resources',
           ],
           'actions': [
             {
               # GN version: //chrome/browser/resources:component_extension_resources
               'action_name': 'generate_component_extension_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/component_extension_resources.grd',
               },
-              'includes': [ '../build/grit_action.gypi' ],
+              'includes': [ 'chrome_grit_action.gypi' ],
             },
             {
               # GN version: //chrome/browser/resources:options_resources
               'action_name': 'generate_options_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/options_resources.grd',
               },
-              'includes': [ '../build/grit_action.gypi' ],
+              'includes': [ 'chrome_grit_action.gypi' ],
             },
             {
               # GN version: //chrome/browser/resources:settings_resources
               'action_name': 'generate_settings_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/settings/settings_resources.grd',
               },
-              'includes': [ '../build/grit_action.gypi' ],
+              'includes': [ 'chrome_grit_action.gypi' ],
             },
           ],
           'copies': [
             {
               # GN version: //chrome/browser/resources:extension_resource_demo
               'destination': '<(PRODUCT_DIR)/resources/extension/demo',
               'files': [
                 'browser/resources/extension_resource/demo/library.js',
               ],
             },
           ],
         }],
         ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
           'dependencies': [
             'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox',
           ],
         }],
         ['enable_extensions==1', {
           'actions': [
             {
               # GN version: //chrome/browser/resources:quota_internals_resources
               'action_name': 'generate_quota_internals_resources',
               'variables': {
                 'grit_grd_file': 'browser/resources/quota_internals_resources.grd',
               },
-              'includes': [ '../build/grit_action.gypi' ],
+              'includes': [ 'chrome_grit_action.gypi' ],
             },
             {
               # GN version: //chrome/browser/resources: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' ],
+              'includes': [ 'chrome_grit_action.gypi' ],
             },
           ],
         }],
       ],
     },
     {
       # GN version: //chrome/browser:chrome_internal_resources_gen
       'target_name': 'chrome_internal_resources_gen',
       'type': 'none',
       'conditions': [
@@ skipping 38 matching lines @@
         'chrome_internal_resources_gen',
         'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
       ],
       'actions': [
         {
           # GN version: //chrome/browser:resources
           'action_name': 'generate_browser_resources',
           'variables': {
             'grit_grd_file': 'browser/browser_resources.grd',
             'grit_additional_defines': [
-              # TODO(dbeam): 'chrome_grit_defines' should just be appended to
-              # this list of 'grit_additional_defines' via the top of this file,
-              # but they're not for some reason. Maybe because they're in
-              # different scopes?
-              '<@(chrome_grit_defines)',
               '-E', 'additional_modules_list_file=<(additional_modules_list_file)',
               '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/common:resources
           'action_name': 'generate_common_resources',
           'variables': {
             'grit_grd_file': 'common/common_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/renderer:resources
           'action_name': 'generate_renderer_resources',
           'variables': {
             'grit_grd_file': 'renderer/resources/renderer_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
       'conditions': [
         ['enable_extensions==1', {
           'actions': [
             {
               # GN version: //chrome/common:extensions_api_resources
               'action_name': 'generate_extensions_api_resources',
               'variables': {
                 'grit_grd_file': 'common/extensions_api_resources.grd',
               },
-              'includes': [ '../build/grit_action.gypi' ],
+              'includes': [ 'chrome_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.
       #
       # GN version: //chrome:strings
       'target_name': 'chrome_strings',
       'type': 'none',
       'actions': [
         {
           # GN version: //chrome/app/resources:locale_settings
           'action_name': 'generate_locale_settings',
           'variables': {
             'grit_grd_file': 'app/resources/locale_settings.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/app:chromium_strings
           'action_name': 'generate_chromium_strings',
           'variables': {
             'grit_grd_file': 'app/chromium_strings.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/app:generated_resources
           'action_name': 'generate_generated_resources',
           'variables': {
             'grit_grd_file': 'app/generated_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/app:google_chrome_strings
           'action_name': 'generate_google_chrome_strings',
           'variables': {
             'grit_grd_file': 'app/google_chrome_strings.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/app:settings_strings
           'action_name': 'generate_settings_strings',
           'variables': {
             'grit_grd_file': 'app/settings_strings.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/app:settings_chromium_strings
           'action_name': 'generate_settings_chromium_strings',
           'variables': {
             'grit_grd_file': 'app/settings_chromium_strings.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
         {
           # GN version: //chrome/app:settings_google_chrome_strings
           'action_name': 'generate_settings_google_chrome_strings',
           'variables': {
             'grit_grd_file': 'app/settings_google_chrome_strings.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
     },
     {
       # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrider_factory_gen_sources
       'target_name': 'make_chrome_ui_string_overrider_factory',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'chrome_strings',
@@ skipping 82 matching lines @@
                 'app/resources/locale_settings_mac.grd',
           }],
         ],  # conditions
       },  # variables
       'actions': [
         {
           'action_name': 'generate_platform_locale_settings',
           'variables': {
             'grit_grd_file': '<(platform_locale_settings_grd)',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # GN version: //chrome/app/theme:theme_resources
       'target_name': 'theme_resources',
       'type': 'none',
       'dependencies': [
         '../ui/resources/ui_resources.gyp:ui_resources',
         'chrome_unscaled_resources',
       ],
       'actions': [
         {
           'action_name': 'generate_theme_resources',
           'variables': {
             'grit_grd_file': 'app/theme/theme_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # GN version: //chrome:packed_extra_resources
       'target_name': 'packed_extra_resources',
       'type': 'none',
       'dependencies': [
         'chrome_extra_resources',
@@ skipping 197 matching lines @@
     {
       # GN version: //chrome/app/theme:chrome_unscaled_resources
       'target_name': 'chrome_unscaled_resources',
       'type': 'none',
       'actions': [
         {
           'action_name': 'generate_chrome_unscaled_resources',
           'variables': {
             'grit_grd_file': 'app/theme/chrome_unscaled_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # GN version: //chrome/browser/resources:options_test_resources
       'target_name': 'options_test_resources',
       'type': 'none',
       'actions': [
         {
           'action_name': 'generate_options_test_resources',
           'variables': {
             'grit_grd_file': 'browser/resources/options_test_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # GN version: //chrome/test/data/resources:webui_test_resources
       'target_name': 'webui_test_resources',
       'type': 'none',
       'actions': [
         {
           'action_name': 'generate_webui_test_resources',
           'variables': {
             'grit_grd_file': 'test/data/webui_test_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # GN version: //chrome:browser_tests_pak
       'target_name': 'browser_tests_pak',
       'type': 'none',
       'dependencies': [
         'options_test_resources',
         'webui_test_resources',
       ],
       'actions': [
         {
           'action_name': 'repack_browser_tests_pak',
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/chrome/options_test_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },
   ], # targets
 }