diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 22:50:28 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 22:50:28 +0000 |
| commit | 475a87a928354bd896d4149f69de2c01185f6187 (patch) | |
| tree | 6244df23cf0eb17201d2ee178017846032522edc /chrome/chrome_repack_resources.gypi | |
| parent | 864bca830cc7889b457f3e4a77be0712b3c69e93 (diff) | |
| download | chromium_src-475a87a928354bd896d4149f69de2c01185f6187.zip chromium_src-475a87a928354bd896d4149f69de2c01185f6187.tar.gz chromium_src-475a87a928354bd896d4149f69de2c01185f6187.tar.bz2 | |
Revert 217346 "Remove chrome.pak references, build resources int..."
Compile failures on main builders, not seen on try bots.
> 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.
>
> TBR=tony@chromium.org
>
> BUG=52609
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216822
>
> Review URL: https://codereview.chromium.org/22339020
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/22794013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217362 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, 3 insertions, 15 deletions
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 7480c2d..8519aab 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -5,26 +5,14 @@ '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': [ @@ -35,9 +23,9 @@ '<(grit_out_dir)/sync_file_system_internals_resources.pak', ], }], - ['enable_extensions==1', { + ['OS != "ios"', { 'pak_inputs': [ - '<(grit_out_dir)/extensions_api_resources.pak', + '<(grit_out_dir)/devtools_discovery_page_resources.pak', ], }], ], |