diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 07:30:15 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 07:30:15 +0000 |
| commit | 5351a49d9762480ab0cd9ce27b8d3cbcd6bbee06 (patch) | |
| tree | c9483adbe25aa4d92c72e9a3a637d8e3c049ac52 /chrome/chrome_dll.gypi | |
| parent | 295429f88b94666a2239088cdda1cb277d56dafb (diff) | |
| download | chromium_src-5351a49d9762480ab0cd9ce27b8d3cbcd6bbee06.zip chromium_src-5351a49d9762480ab0cd9ce27b8d3cbcd6bbee06.tar.gz chromium_src-5351a49d9762480ab0cd9ce27b8d3cbcd6bbee06.tar.bz2 | |
Metro/HiDPI: Move 1x icons into separate pak file
Currently all 1x art files are repacked into chrome.pak files.
This is a problem on Windows where we want to choose which pak file to load based on metro and DPI scale.
As a first step this CL does the following:
- add a new enable_hidpi build flag. This allows us to test HiDPI mode on Windows Chrome.
- stop packing theme_resources_standard.pak and ui_resources_standard.pak into chrome.pak
- update the Mac and Windows installer code to package the extra pak files.
Note, I'll be updating the Linux installer script in a separate CL. I'm still looking into the ChromeOS situation.
BUG=114311
TEST=Ran on Windows, and Mac and Linux.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132517
Review URL: http://codereview.chromium.org/10024050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 2744184..c926dc4 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -100,7 +100,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_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)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', @@ -304,8 +303,10 @@ 'app/theme/star.pdf', 'app/theme/star_lit.pdf', 'browser/mac/install.sh', - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', - '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', + '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', + '<(grit_out_dir)/theme_resources_standard.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak', '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', # Note: pseudo_locales are generated via the packed_resources # dependency but not copied to the final target. See @@ -354,11 +355,6 @@ ], 'repack_path': '../tools/grit/grit/format/repack.py', }, - 'actions': [ - { - 'includes': ['chrome_repack_theme_resources_2x.gypi'] - }, - ], 'postbuilds': [ { # This step causes an error to be raised if the .order file @@ -537,6 +533,12 @@ '../pdf/pdf.gyp:pdf', ], }], + ['enable_hidpi==1', { + 'mac_bundle_resources': [ + '<(grit_out_dir)/theme_resources_2x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.pak', + ], + }], ], # conditions }], # OS=="mac" ], # conditions |