Fix missing string resource for extensions_unittests on Chrome OS

Chrome OS requires app_locale_strings for font configuration information,
so it needs to be part of the .pak file for extensions_unittests.

BUG=397245
TEST=build extensions_unittests with chromeos=1, it doesn't crash on start

Review URL: https://codereview.chromium.org/418133002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285450 0039d316-1c4b-4281-b951-d872f2087c98
parent 9b478731
......@@ -703,6 +703,7 @@
'../content/content_shell_and_tests.gyp:test_support_content',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/strings/ui_strings.gyp:ui_strings',
'extensions_common',
'extensions_renderer',
'extensions_resources.gyp:extensions_resources',
......@@ -743,11 +744,17 @@
],
'actions': [
{
# TODO(jamescook): Use the same .pak file for both app_shell and
# extensions_unittests by creating an extensions_resources.pak file
# that can be used in both places. This will save build time.
# http://crbug.com/397250
'action_name': 'repack_extensions_unittests_pak',
'variables': {
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
],
'pak_output': '<(PRODUCT_DIR)/extensions_unittests_resources.pak',
},
......
......@@ -46,7 +46,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak',
# TODO(jamescook): Extract the extension/app related resources
# from generated_resources_en-US.pak.
# from generated_resources_en-US.pak. http://crbug.com/397250
'<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment