summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-21 16:53:04 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-21 16:53:04 +0000
commit3ca9a76e1fa625c27c3f23d5071b213a7b5f4102 (patch)
tree973e7f6eeed9eb73c0766689e61ba96efaed6fdc /chrome/chrome_dll.gypi
parent028c4ec16f1af021ee2b04006b8f8ca4de21d7c3 (diff)
downloadchromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.zip
chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.tar.gz
chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.tar.bz2
Revert 82497 - Split out large icons into a separate resource pakThis is a part of r82185 that was reverted. The change was reverted because it caused a performance regression.I'm checking in just the reorganization code to narrow down exactly which part of the change caused the regression.The only code change here is some header includes. If this change passes the perf bot then my next change will be to load the new resource pak.BUG=NoneTEST=NoneReview URL: http://codereview.chromium.org/6883110
TBR=sail@chromium.org Review URL: http://codereview.chromium.org/6879113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi20
1 files changed, 0 insertions, 20 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index d200ad2..46fd3ca 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -117,7 +117,6 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -322,7 +321,6 @@
'<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak',
'<(grit_out_dir)/renderer_resources.pak',
'<(grit_out_dir)/theme_resources.pak',
- '<(grit_out_dir)/theme_resources_standard.pak',
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
@@ -341,24 +339,6 @@
'process_outputs_as_mac_bundle_resources': 1,
},
{
- 'action_name': 'repack_theme_resources_large',
- 'variables': {
- 'pak_inputs': [
- '<(grit_out_dir)/theme_resources_large.pak',
- ],
- },
- 'inputs': [
- '<(repack_path)',
- '<@(pak_inputs)',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak',
- ],
- 'action': ['python', '<(repack_path)', '<@(_outputs)',
- '<@(pak_inputs)'],
- 'process_outputs_as_mac_bundle_resources': 1,
- },
- {
'action_name': 'repack_locales',
'process_outputs_as_mac_bundle_resources': 1,
'variables': {