chrome/installer/mini_installer.gyp - Issue 12326117: Fix create_installer_archive.py to be more flexible with output directory names

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/mini_installer.gyp

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: handle x64 vs x86 a bit more intelligently 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

Index: chrome/installer/mini_installer.gyp

diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp

index e8a1cde987f2ee56dedb28f089da4ec6c4f4aa1f..57e1855355235d8ed616f0a3da758dbe7e53e4b6 100644

--- a/chrome/installer/mini_installer.gyp

+++ b/chrome/installer/mini_installer.gyp

@@ -232,6 +232,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': [

@@ -264,6 +271,7 @@

'<(enable_hidpi_flag)',

'<(enable_touch_ui_flag)',

'<(component_build_flag)',

+ '<(target_arch_flag)',

# TODO(sgk): may just use environment variables

#'--distribution=$(CHROMIUM_BUILD)',

'--distribution=_google_chrome',

« no previous file with comments | « no previous file | chrome/tools/build/win/create_installer_archive.py » ('j') | chrome/tools/build/win/create_installer_archive.py » ('J')