diff options
| author | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 09:57:40 +0000 |
|---|---|---|
| committer | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 09:57:40 +0000 |
| commit | c8df0d5448b7d7baa602df83adf91f0015152930 (patch) | |
| tree | 7f4aafe09143b3af21a55428681a4e34fc6acb61 /chrome/chrome_ios_bundle_resources.gypi | |
| parent | 9132fe8464be21ca0738873db2abae5dd348922c (diff) | |
| download | chromium_src-c8df0d5448b7d7baa602df83adf91f0015152930.zip chromium_src-c8df0d5448b7d7baa602df83adf91f0015152930.tar.gz chromium_src-c8df0d5448b7d7baa602df83adf91f0015152930.tar.bz2 | |
Revert 218956 "Remove chrome.pak references, build resources int..."
It seemes to have broken the mac buildbot.
I'll post more info here soon, crbug.com does not seem to be working at the moment.
> 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
> TBR=phajdan.jr@chromium.org for chrome/installer/linux
>
> Review URL: https://chromiumcodereview.appspot.com/23205023
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/22807012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_ios_bundle_resources.gypi')
| -rw-r--r-- | chrome/chrome_ios_bundle_resources.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_ios_bundle_resources.gypi b/chrome/chrome_ios_bundle_resources.gypi index efcb5f8..988654b 100644 --- a/chrome/chrome_ios_bundle_resources.gypi +++ b/chrome/chrome_ios_bundle_resources.gypi @@ -7,6 +7,7 @@ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', ], 'mac_bundle_resources': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', |