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

Unified Diff: chrome/installer/mini_installer.gypi

Issue 12326117: Fix create_installer_archive.py to be more flexible with output directory names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nit related to potentially undefied variable under rare circumstances Created 7 years, 10 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/installer/mini_installer.gyp ('k') | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer.gypi
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index a994740797fa6fa7590f5b00a4654b479026b6f2..c3c12a2cb87f4aae907158115fcc30f233758b8e 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -181,6 +181,13 @@
'<(PRODUCT_DIR)/nacl64.exe',
'<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
],
+ 'variables': {
+ 'target_arch_flag': '--target_arch=x64',
+ },
+ }, {
+ 'variables': {
+ 'target_arch_flag': '--target_arch=x86',
+ },
}],
],
'inputs': [
@@ -212,6 +219,7 @@
'--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
'<(enable_hidpi_flag)',
'<(enable_touch_ui_flag)',
+ '<(target_arch_flag)',
# TODO(sgk): may just use environment variables
#'--distribution=$(CHROMIUM_BUILD)',
'--distribution=_google_chrome',
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698