diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 07:30:58 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 07:30:58 +0000 |
| commit | 3fb8b90a5007e3e4b377d851369d60f3deb2f4ef (patch) | |
| tree | 6a7ba2138b7b44e75f94ab4280a4c3a928379f5b /chrome/chrome_repack_resources.gypi | |
| parent | bc3d66acddc36838555d2a1328a070d86e038284 (diff) | |
| download | chromium_src-3fb8b90a5007e3e4b377d851369d60f3deb2f4ef.zip chromium_src-3fb8b90a5007e3e4b377d851369d60f3deb2f4ef.tar.gz chromium_src-3fb8b90a5007e3e4b377d851369d60f3deb2f4ef.tar.bz2 | |
Remove chrome.pak references, build resources into resources.pak
This puts resources that used to be in chrome.pak and/or compiled in to
chrome.dll into resources.pak. resources.pak is already loaded at startup
on all platforms so having some resources in a separate pak file isn't
beneficial.
R=tony
TBR=sky
BUG=52609
Review URL: https://chromiumcodereview.appspot.com/22339020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_resources.gypi')
| -rw-r--r-- | chrome/chrome_repack_resources.gypi | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 8519aab..7480c2d 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -5,14 +5,26 @@ 'action_name': 'repack_resources', 'variables': { 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', + '<(grit_out_dir)/browser_resources.pak', + '<(grit_out_dir)/common_resources.pak', '<(grit_out_dir)/memory_internals_resources.pak', '<(grit_out_dir)/net_internals_resources.pak', '<(grit_out_dir)/signin_internals_resources.pak', '<(grit_out_dir)/sync_internals_resources.pak', '<(grit_out_dir)/translate_internals_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', ], 'conditions': [ + ['OS != "ios"', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', + '<(grit_out_dir)/devtools_discovery_page_resources.pak', + ], + }], ['OS != "ios" and OS != "android"', { # New paks should be added here by default. 'pak_inputs': [ @@ -23,9 +35,9 @@ '<(grit_out_dir)/sync_file_system_internals_resources.pak', ], }], - ['OS != "ios"', { + ['enable_extensions==1', { 'pak_inputs': [ - '<(grit_out_dir)/devtools_discovery_page_resources.pak', + '<(grit_out_dir)/extensions_api_resources.pak', ], }], ], |