diff options
| author | Hokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 19:42:14 +0000 |
|---|---|---|
| committer | Hokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 19:42:14 +0000 |
| commit | 03c9d790cb425d9a012eaea0bfbbaf6cb0722baa (patch) | |
| tree | 8267bee30d06ca885b125a85eecd56a753b81b85 /apps/apps.gypi | |
| parent | bac0af657a57da34157045b3057ffecf1fc93af7 (diff) | |
| download | chromium_src-03c9d790cb425d9a012eaea0bfbbaf6cb0722baa.zip chromium_src-03c9d790cb425d9a012eaea0bfbbaf6cb0722baa.tar.gz chromium_src-03c9d790cb425d9a012eaea0bfbbaf6cb0722baa.tar.bz2 | |
[App Shell] Include all chrome-specific resources in app_shell.pak.
With this patch, now app_shell only needs its own app_shell.pak resource
file.
BUG=344974
R=jamescook@chromium.org,tfarina@chromium.org
Review URL: https://codereview.chromium.org/174953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/apps.gypi')
| -rw-r--r-- | apps/apps.gypi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index 5058bc1..3b780ab 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -105,7 +105,11 @@ 'target_name': 'app_shell_pak', 'type': 'none', 'dependencies': [ + # 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', ], 'variables': { 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', @@ -116,6 +120,9 @@ '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', ], }, 'inputs': [ @@ -140,9 +147,6 @@ 'dependencies': [ 'app_shell_pak', 'apps', - 'chrome_resources.gyp:packed_resources', - # For resources.pak for features JSON files. - 'chrome_resources.gyp:packed_extra_resources', 'test_support_common', '../base/base.gyp:base', '../base/base.gyp:base_prefs_test_support', |