Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Unified Diff: components/components_tests.gyp

Issue 900223003: components: Provide an unified target to generate components_tests_resources.pak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 521a4c84feb7d8a1208ab4ea4df609d7e314bc35..bdd79132212c0d42798b762964627c6239ab7a09 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -14,6 +14,37 @@
['android_webview_build == 0', {
'targets': [
{
+ 'target_name': 'components_tests_pak',
+ 'type': 'none',
+ 'dependencies': [
+ '../ui/resources/ui_resources.gyp:ui_resources',
+ '../ui/strings/ui_strings.gyp:ui_strings',
+ 'components_resources.gyp:components_resources',
+ 'components_strings.gyp:components_strings',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'repack_components_tests_pak',
+ 'variables': {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.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)/components_tests_resources.pak',
+ },
+ 'includes': [ '../build/repack_action.gypi' ],
+ },
+ ],
+ 'direct_dependent_settings': {
+ 'mac_bundle_resources': [
+ '<(PRODUCT_DIR)/components_tests_resources.pak',
+ ],
+ },
+ },
+ {
# GN version: //components/components_unittests
'target_name': 'components_unittests',
'type': '<(gtest_target_type)',
@@ -422,25 +453,7 @@
'components.gyp:web_resource_test_support',
'components_resources.gyp:components_resources',
'components_strings.gyp:components_strings',
- ],
- 'actions': [
- {
- 'action_name': 'repack_components_pak',
- 'variables': {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.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)/components_unittests_resources.pak',
- },
- 'includes': [ '../build/repack_action.gypi' ],
- },
- ],
- 'mac_bundle_resources': [
- '<(PRODUCT_DIR)/components_unittests_resources.pak',
+ 'components_tests_pak',
],
'conditions': [
['toolkit_views == 1', {
@@ -952,6 +965,7 @@
'components.gyp:pref_registry_test_support',
'components_resources.gyp:components_resources',
'components_strings.gyp:components_strings',
+ 'components_tests_pak',
],
'include_dirs': [
'..',
@@ -965,19 +979,6 @@
'dom_distiller/content/distiller_page_web_contents_browsertest.cc',
'password_manager/content/renderer/credential_manager_client_browsertest.cc',
],
- 'actions': [
- {
- 'action_name': 'repack_components_pak',
- 'variables': {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
- ],
- 'pak_output': '<(PRODUCT_DIR)/components_resources.pak',
- },
- 'includes': [ '../build/repack_action.gypi' ],
- },
- ],
'conditions': [
['OS == "android"', {
'sources!': [

Powered by Google App Engine
This is Rietveld 408576698