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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fixed a comma problem with chrome_resources.gyp file 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..6edb8194c8477a9f4c228ad2f04b7f8f308ace50 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/chromium_strings.h',

+ '<(grit_out_dir)/grit/generated_resources.h',

+ '<(grit_out_dir)/grit/google_chrome_strings.h',

+ '<(grit_out_dir)/grit/settings_chromium_strings.h',

+ '<(grit_out_dir)/grit/settings_google_chrome_strings.h',

+ '<(grit_out_dir)/grit/settings_strings.h',

+ '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chromium_strings.h',

+ '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_google_chrome_strings.h',

+ '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strings.h'

'outputs': [

'<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_overrider_factory.cc',

@@ -320,7 +331,15 @@

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