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

Unified Diff: chrome/tools/build/win/create_installer_archive.py

Issue 10440037: Remove the enable_metro GYP flag, effectively making it on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/tools/build/win/create_installer_archive.py
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index a7ae633024ed99e8d6a92eff05b8f4488d93fe83..09452b3e6a32ae8fc4681025d6bda7b1fbdf0d2d 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -90,7 +90,7 @@ def CompressUsingLZMA(build_dir, compressed_file, input_file):
def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
- enable_hidpi, enable_metro):
+ enable_hidpi, enable_touch_ui):
"""Copies the files required for installer archive.
Copies all common files required for various distributions of Chromium and
also files for the specific Chromium build specified by distribution.
@@ -103,8 +103,8 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
staging_dir, build_dir)
if enable_hidpi == '1':
CopySectionFilesToStagingDir(config, 'HIDPI', staging_dir, build_dir)
- if enable_metro == '1':
- CopySectionFilesToStagingDir(config, 'METRO', staging_dir, build_dir)
+ if enable_touch_ui == '1':
+ CopySectionFilesToStagingDir(config, 'TOUCH', staging_dir, build_dir)
def CopySectionFilesToStagingDir(config, section, staging_dir, src_dir):
@@ -493,12 +493,12 @@ def main(options):
if options.build_dir != options.output_dir:
CopyAllFilesToStagingDir(config, options.distribution,
staging_dir, options.output_dir,
- options.enable_hidpi, options.enable_metro)
+ options.enable_hidpi, options.enable_touch_ui)
# Now copy the remainder of the files from the build dir.
CopyAllFilesToStagingDir(config, options.distribution,
staging_dir, options.build_dir,
- options.enable_hidpi, options.enable_metro)
+ options.enable_hidpi, options.enable_touch_ui)
if options.component_build == '1':
DoComponentBuildTasks(staging_dir, options.build_dir, current_version)
@@ -555,8 +555,8 @@ def _ParseOptions():
help='Name used to prefix names of generated archives.')
parser.add_option('--enable_hidpi', default='0',
help='Whether to include HiDPI resource files.')
- parser.add_option('--enable_metro', default='0',
- help='Whether to include resource files from the "METRO" section of the '
+ parser.add_option('--enable_touch_ui', default='0',
+ help='Whether to include resource files from the "TOUCH" section of the '
'input file.')
parser.add_option('--component_build', default='0',
help='Whether this archive is packaging a component build.')

Powered by Google App Engine
This is Rietveld 408576698