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

Unified Diff: chrome/chrome_resources.gyp

Issue 10103022: Revert 132517 - Metro/HiDPI: Move 1x icons into separate pak file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/chrome_repack_theme_resources_2x.gypi ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_resources.gyp
===================================================================
--- chrome/chrome_resources.gyp (revision 132528)
+++ chrome/chrome_resources.gyp (working copy)
@@ -219,39 +219,6 @@
},
],
'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',
« no previous file with comments | « chrome/chrome_repack_theme_resources_2x.gypi ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698