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

Unified Diff: apps/apps.gypi

Issue 176873016: [AppShell] Remove chrome_100_percent.pak dependancy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 6 years, 9 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 | apps/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/apps.gypi
diff --git a/apps/apps.gypi b/apps/apps.gypi
index e0031fb090b58eae5c2bebc148648d224aaef17f..7d7d79cf7be980742415e65eee8cbb1ceb845b78 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -103,11 +103,17 @@
'target_name': 'app_shell_pak',
'type': 'none',
'dependencies': [
- # Need dev-tools related resources in shell_resources.pak and devtools_resources.pak.
+ # Need extension related resources in common_resources.pak and
+ # renderer_resources_100_percent.pak
+ 'chrome_resources.gyp:chrome_resources',
+ # Need app related resources in theme_resources_100_percent.pak
+ 'chrome_resources.gyp:theme_resources',
+ # Need dev-tools related resources in shell_resources.pak and
+ # devtools_resources.pak.
'../content/content_shell_and_tests.gyp:generate_content_shell_resources',
'../content/browser/devtools/devtools_resources.gyp:devtools_resources',
- # Need features JSON files in common_resources.pak.
- 'chrome_resources.gyp:chrome_resources',
+ '../ui/base/strings/ui_strings.gyp:ui_strings',
+ '../ui/resources/ui_resources.gyp:ui_resources',
],
'variables': {
'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
@@ -117,10 +123,19 @@
'action_name': 'repack_app_shell_pack',
'variables': {
'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
'<(grit_out_dir)/common_resources.pak',
'<(grit_out_dir)/extensions_api_resources.pak',
+ # TODO(Haojian): extra the extension/app related reousrces
James Cook 2014/03/07 17:40:10 nit: reousrces -> resources Also, can you use you
+ # from generated_resources_en-US.pak and
+ # theme_resources_100_percent.pak.
Haojian Wu 2014/03/07 11:20:21 james@, please check whether the TODO is expected
James Cook 2014/03/07 17:40:10 Yes, that seems fine. I'm not sure if the resourc
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
],
},
'inputs': [
« no previous file with comments | « no previous file | apps/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698