diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 05:33:09 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 05:33:09 +0000 |
| commit | 5db2b749d3f5d907fc490baa4bd5935dc21737d4 (patch) | |
| tree | 3c2c17e4b8acde4c19cecb72cf04519cdb06906b /chrome/chrome_android_paks.gypi | |
| parent | 4aec86591ca558cc64db05a8ab7dbc14dee7aec9 (diff) | |
| download | chromium_src-5db2b749d3f5d907fc490baa4bd5935dc21737d4.zip chromium_src-5db2b749d3f5d907fc490baa4bd5935dc21737d4.tar.gz chromium_src-5db2b749d3f5d907fc490baa4bd5935dc21737d4.tar.bz2 | |
Remove chrome.pak references, build resources into resources.pak (try 2)
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.
This previously landed as https://codereview.chromium.org/22339020 and
was reverted due to various scripts/etc still referencing chrome.pak. This
patch still builds chrome.pak, but with only the (tiny) net_resources in
it. After this lands I'll go remove references to chrome.pak and then remove
it completely once all references are gone.
BUG=52609
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=218956
R=phajdan.jr@chromium.org, sky@chromium.org, tony@chromium.org
Review URL: https://codereview.chromium.org/23205023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android_paks.gypi')
| -rw-r--r-- | chrome/chrome_android_paks.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index 6a95ee5..7937f2f 100644 --- a/chrome/chrome_android_paks.gypi +++ b/chrome/chrome_android_paks.gypi @@ -5,7 +5,6 @@ 'variables': { 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)', 'chrome_android_pak_input_resources': [ - '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/resources.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/am.pak', @@ -54,7 +53,6 @@ '<(PRODUCT_DIR)/locales/zh-TW.pak', ], 'chrome_android_pak_output_resources': [ - '<(chrome_android_pak_output_folder)/chrome.pak', '<(chrome_android_pak_output_folder)/resources.pak', '<(chrome_android_pak_output_folder)/chrome_100_percent.pak', '<(chrome_android_pak_output_folder)/am.pak', |