| Index: components/components_tests.gyp
|
| diff --git a/components/components_tests.gyp b/components/components_tests.gyp
|
| index a1f587a29e07e97b8ea7cdb6e90e607afdc36e41..ffe015902fbab4f97ff2174f69a504299333ee37 100644
|
| --- a/components/components_tests.gyp
|
| +++ b/components/components_tests.gyp
|
| @@ -166,9 +166,6 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base_prefs_test_support',
|
| '../base/base.gyp:test_support_base',
|
| - # TODO(blundell): Eliminate this dependency by having
|
| - # components_unittests have its own pakfile. crbug.com/348563
|
| - '../chrome/chrome_resources.gyp:packed_extra_resources',
|
| # TODO(blundell): Eliminate the need for this dependency in code
|
| # that iOS shares. crbug.com/325243
|
| '../content/content_shell_and_tests.gyp:test_support_content',
|
| @@ -249,6 +246,19 @@
|
| # Dependencies of variations
|
| 'components.gyp:variations',
|
| ],
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'repack_components_pak',
|
| + 'variables': {
|
| + 'pak_inputs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/strings/component_strings_en-US.pak',
|
| + ],
|
| + 'pak_output': '<(PRODUCT_DIR)/components_unittests_resources.pak',
|
| + },
|
| + 'includes': [ '../build/repack_action.gypi' ],
|
| + },
|
| + ],
|
| 'conditions': [
|
| ['OS != "ios"', {
|
| 'sources': [
|
| @@ -302,7 +312,6 @@
|
| 'components.gyp:web_modal_test_support',
|
| ],
|
| }, { # 'OS == "ios"'
|
| - 'includes': ['../chrome/chrome_ios_bundle_resources.gypi'],
|
| 'sources/': [
|
| ['exclude', '\\.cc$'],
|
| ['exclude', '\\.mm$'],
|
| @@ -608,7 +617,7 @@
|
| ],
|
| 'actions': [
|
| {
|
| - 'action_name': 'repack_components_pack',
|
| + 'action_name': 'repack_components_pak',
|
| 'variables': {
|
| 'pak_inputs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',
|
|
|