Variations string overrides now handles more .grd files

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',
     'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
   },
   'targets': [
     {
@@ skipping 283 matching lines @@
           },
           'includes': [ '../build/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', ],
+      'dependencies': [
+        'chrome_strings',
+        '../components/components_strings.gyp:components_strings',
+      ],
       'actions': [
         {
           'action_name': 'generate_ui_string_overrider',
           'inputs': [
             '../components/variations/service/generate_ui_string_overrider.py',
-            '<(grit_out_dir)/grit/generated_resources.h'
+            '<(grit_out_dir)/grit/generated_resources.h',
+            '<(grit_out_dir)/grit/google_chrome_strings.h',
+            '<(grit_out_dir)/grit/chromium_strings.h',

[sky, 2015/10/28 15:47:54]

nit: sort these.

[Moe, 2015/10/29 01:13:20]

Done.

+            '<(grit_out_dir)/grit/settings_strings.h',
+            '<(grit_out_dir)/grit/settings_chromium_strings.h',
+            '<(grit_out_dir)/grit/settings_google_chrome_strings.h',
+            '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strings.h',

[sky, 2015/10/28 15:47:54]

What target are these files listed as outputs of?

[Moe, 2015/10/29 01:13:20]

../components/components_strings.gyp:components_strings

[sky, 2015/10/29 15:57:01]

I don't seem them listed as outputs in that target. What am I missing?

[Moe, 2015/10/29 17:16:10]

chrome_strings target also doesn't list generated_resources.h as an output. the
equivalent grd files though mention the .h file as the output. Sorry I'm pretty
new to this. there's a high chance I'm missing something.

+            '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chromium_strings.h',
+            '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_google_chrome_strings.h'
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_overrider_factory.cc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_overrider_factory.h',
           ],
           'action': [
             'python',
             '../components/variations/service/generate_ui_string_overrider.py',
             '-N', 'chrome_variations',
             '-o', '<(SHARED_INTERMEDIATE_DIR)',
             '-S', 'chrome/browser/metrics/variations/ui_string_overrider_factory.cc',
             '-H', 'chrome/browser/metrics/variations/ui_string_overrider_factory.h',
             '<(grit_out_dir)/grit/generated_resources.h',
+            '<(grit_out_dir)/grit/google_chrome_strings.h',
+            '<(grit_out_dir)/grit/chromium_strings.h',

[sky, 2015/10/28 15:47:54]

nit: sort

[Moe, 2015/10/29 01:13:20]

Done.

+            '<(grit_out_dir)/grit/settings_strings.h',
+            '<(grit_out_dir)/grit/settings_chromium_strings.h',
+            '<(grit_out_dir)/grit/settings_google_chrome_strings.h',
+            '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strings.h',
+            '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chromium_strings.h',
+            '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_google_chrome_strings.h'
           ],
           'message': 'Generating generated resources map.',
         }
       ],
     },
     {
       # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrider_factory
       'target_name': 'chrome_ui_string_overrider_factory',
       'type': 'static_library',
       'dependencies': [
@@ skipping 331 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },
   ], # targets
 }