| Index: chrome/chrome_resources.gyp
|
| diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
|
| index d78b04f53ba0ba8b1b1af6f15d4e161314b0bb1d..45ca3236ad50c2c973a40f5eaa5664544e2814ab 100644
|
| --- a/chrome/chrome_resources.gyp
|
| +++ b/chrome/chrome_resources.gyp
|
| @@ -17,6 +17,7 @@
|
| # GN version: //chrome:extra_resources
|
| 'target_name': 'chrome_extra_resources',
|
| 'type': 'none',
|
| + 'hard_dependency': 1,
|
| # 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.
|
| @@ -324,14 +325,14 @@
|
| 'inputs': [
|
| '../components/variations/service/generate_ui_string_overrider.py',
|
| '<(grit_out_dir)/grit/chromium_strings.h',
|
| - '<(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/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'
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strings.h'
|
| ],
|
| 'outputs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/ui_string_overrider_factory.cc',
|
| @@ -345,14 +346,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/chromium_strings.h',
|
| - '<(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/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'
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strings.h'
|
| ],
|
| 'message': 'Generating generated resources map.',
|
| }
|
| @@ -375,6 +376,7 @@
|
| # GN version: //chrome/app/resources:platform_locale_settings
|
| 'target_name': 'platform_locale_settings',
|
| 'type': 'none',
|
| + 'hard_dependency': 1,
|
| 'variables': {
|
| 'conditions': [
|
| ['OS=="win"', {
|
| @@ -417,6 +419,7 @@
|
| # GN version: //chrome/app/theme:theme_resources
|
| 'target_name': 'theme_resources',
|
| 'type': 'none',
|
| + 'hard_dependency': 1,
|
| 'dependencies': [
|
| '../ui/resources/ui_resources.gyp:ui_resources',
|
| 'chrome_unscaled_resources',
|
| @@ -639,6 +642,7 @@
|
| # GN version: //chrome/app/theme:chrome_unscaled_resources
|
| 'target_name': 'chrome_unscaled_resources',
|
| 'type': 'none',
|
| + 'hard_dependency': 1,
|
| 'actions': [
|
| {
|
| 'action_name': 'generate_chrome_unscaled_resources',
|
| @@ -654,6 +658,7 @@
|
| # GN version: //chrome/browser/resources:options_test_resources
|
| 'target_name': 'options_test_resources',
|
| 'type': 'none',
|
| + 'hard_dependency': 1,
|
| 'actions': [
|
| {
|
| 'action_name': 'generate_options_test_resources',
|
| @@ -669,6 +674,7 @@
|
| # GN version: //chrome/test/data/resources:webui_test_resources
|
| 'target_name': 'webui_test_resources',
|
| 'type': 'none',
|
| + 'hard_dependency': 1,
|
| 'actions': [
|
| {
|
| 'action_name': 'generate_webui_test_resources',
|
|
|