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

Unified Diff: extensions/extensions.gyp

Issue 413293003: extensions: Create extensions_pak target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 5 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
« no previous file with comments | « no previous file | extensions/test/extensions_unittests_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/extensions.gyp
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 92db41fbeb3b455684e485cab501335e2e01b76c..0320c8f6526f2fd65159413c8c75a7ef52bcd1cc 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -691,6 +691,33 @@
'msvs_disabled_warnings': [ 4267, ],
},
{
+ # 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
+ 'target_name': 'extensions_pak',
+ 'type': 'none',
+ 'dependencies': [
+ '../ui/strings/ui_strings.gyp:ui_strings',
+ 'extensions_resources.gyp:extensions_resources',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'repack_extensions_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.pak',
+ },
+ 'includes': [ '../build/repack_action.gypi' ],
+ },
+ ],
+ },
+ {
# TODO(tfarina): Many extension unit tests run as part of Chrome's
# unit_tests target. They should be moved here, which may require some
# refactoring (ExtensionsBrowserClient, TestingProfile, etc.).
@@ -703,8 +730,8 @@
'../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_pak',
'extensions_renderer',
'extensions_resources.gyp:extensions_resources',
'extensions_strings.gyp:extensions_strings',
@@ -742,25 +769,6 @@
],
}],
],
- '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',
- },
- 'includes': [ '../build/repack_action.gypi' ],
- },
- ],
},
]
}
« no previous file with comments | « no previous file | extensions/test/extensions_unittests_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698