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

Unified Diff: chrome/installer/mini_installer.gyp

Issue 10262012: Fix mini_installer for Metro resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Leave enable_metro off by default. 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 | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer.gyp
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 369e7921ae77cf2b51ee23ee2560fc5c2b768835..0f0de2f8fe7f81061fa3a05d380fbfe13c7a85a2 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -193,6 +193,26 @@
'create_installer_archive_py_path':
'../tools/build/win/create_installer_archive.py',
},
+ 'conditions': [
+ ['enable_hidpi == 1', {
+ 'variables': {
+ 'enable_hidpi_flag': '--enable_hidpi=1',
+ },
+ }, {
+ 'variables': {
+ 'enable_hidpi_flag': '',
+ },
+ }],
+ ['enable_metro == 1', {
+ 'variables': {
+ 'enable_metro_flag': '--enable_metro=1',
+ },
+ }, {
+ 'variables': {
+ 'enable_metro_flag': '',
+ },
+ }],
+ ],
'inputs': [
'<(create_installer_archive_py_path)',
'<(PRODUCT_DIR)/chrome.exe',
@@ -218,6 +238,8 @@
'--staging_dir', '<(INTERMEDIATE_DIR)',
'--input_file', '<(RULE_INPUT_PATH)',
'--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
+ '<(enable_hidpi_flag)',
+ '<(enable_metro_flag)',
# TODO(sgk): may just use environment variables
#'--distribution=$(CHROMIUM_BUILD)',
'--distribution=_google_chrome',
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698