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_dll_bundle.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_dll_bundle.gypi')
| -rw-r--r-- | chrome/chrome_dll_bundle.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index 57bd2b9..9b8d1af 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -61,6 +61,7 @@ 'app/theme/menu_overflow_down.pdf', 'app/theme/menu_overflow_up.pdf', 'browser/mac/install.sh', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', |