chrome/chrome_resources.gyp - Issue 1411153006: Variations string overrides now handles more .grd files

Unified Diff: chrome/chrome_resources.gyp

Issue 1411153006: Variations string overrides now handles more .grd files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments and updated the gyp file (had forgotten to do so ...) Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_resources.gyp

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp

index 492536ca0787a392f82c67762f4eb395a3eb7c79..b5e96f612aaf817d5784767d36581776b27eb003 100644

--- a/chrome/chrome_resources.gyp

+++ b/chrome/chrome_resources.gyp

@@ -301,13 +301,24 @@

'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_st

sky 2015/10/29 15:57:01 I don't seem them listed as outputs in that target

Moe 2015/10/29 17:16:10 chrome_strings target also doesn't list generated_

+ '<(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',

@@ -321,6 +332,14 @@

'-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',