Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: chrome/chrome_resources.gyp

Issue 10024050: Metro/HiDPI: Move 1x icons into separate pak file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix hidpi flag Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 3195eb8d7cbab6793f4a7e68798765581063bcd5..d4ec7b29d88a396ab67cd817da2d4e8bd74034be 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -212,6 +212,39 @@
},
],
'includes': [ '../build/grit_target.gypi' ],
+ 'conditions': [
+ ['OS != "mac"', {
+ # Copy pak files to the product directory. These files will be picked
+ # up by the following installer scripts:
+ # - Windows: chrome/installer/mini_installer/chrome.release
+ # - Linux: chrome/installer/linux/internal/common/installer.include
+ # Ensure that the above scripts are updated when adding or removing
+ # pak files.
+ # Coping files to the product directory is not needed on the Mac
+ # since the framework build phase will copy them into the framework
+ # bundle directly.
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [
+ '<(grit_out_dir)/theme_resources_standard.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
+ ],
+ },
+ ],
+ }],
+ ['OS != "mac" and enable_hidpi == 1', {
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [
+ '<(grit_out_dir)/theme_resources_2x.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.pak',
+ ],
+ },
+ ],
+ }],
+ ],
},
{
'target_name': 'packed_extra_resources',

Powered by Google App Engine
This is Rietveld 408576698