OLD | NEW |
1 { | 1 { |
2 'variables': { | 2 'variables': { |
3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', | 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', |
6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
7 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
9 'mini_installer_internal_deps%': 0, | 9 'mini_installer_internal_deps%': 0, |
10 'mini_installer_official_deps%': 0, | 10 'mini_installer_official_deps%': 0, |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 228 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
229 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 229 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
230 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 230 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
231 ], | 231 ], |
232 }], | 232 }], |
233 ['target_arch=="x64"', { | 233 ['target_arch=="x64"', { |
234 'inputs!': [ | 234 'inputs!': [ |
235 '<(PRODUCT_DIR)/nacl64.exe', | 235 '<(PRODUCT_DIR)/nacl64.exe', |
236 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 236 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
237 ], | 237 ], |
| 238 'variables': { |
| 239 'target_arch_flag': '--target_arch=x64', |
| 240 }, |
| 241 }, { |
| 242 'variables': { |
| 243 'target_arch_flag': '--target_arch=x86', |
| 244 }, |
238 }], | 245 }], |
239 ], | 246 ], |
240 'inputs': [ | 247 'inputs': [ |
241 '<(create_installer_archive_py_path)', | 248 '<(create_installer_archive_py_path)', |
242 '<(PRODUCT_DIR)/app_host.exe', | 249 '<(PRODUCT_DIR)/app_host.exe', |
243 '<(PRODUCT_DIR)/chrome.exe', | 250 '<(PRODUCT_DIR)/chrome.exe', |
244 '<(PRODUCT_DIR)/chrome.dll', | 251 '<(PRODUCT_DIR)/chrome.dll', |
245 '<(PRODUCT_DIR)/nacl64.exe', | 252 '<(PRODUCT_DIR)/nacl64.exe', |
246 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 253 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
247 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 254 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
(...skipping 12 matching lines...) Expand all Loading... |
260 'action': [ | 267 'action': [ |
261 'python', | 268 'python', |
262 '<(create_installer_archive_py_path)', | 269 '<(create_installer_archive_py_path)', |
263 '--build_dir', '<(PRODUCT_DIR)', | 270 '--build_dir', '<(PRODUCT_DIR)', |
264 '--staging_dir', '<(INTERMEDIATE_DIR)', | 271 '--staging_dir', '<(INTERMEDIATE_DIR)', |
265 '--input_file', '<(RULE_INPUT_PATH)', | 272 '--input_file', '<(RULE_INPUT_PATH)', |
266 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', | 273 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
267 '<(enable_hidpi_flag)', | 274 '<(enable_hidpi_flag)', |
268 '<(enable_touch_ui_flag)', | 275 '<(enable_touch_ui_flag)', |
269 '<(component_build_flag)', | 276 '<(component_build_flag)', |
| 277 '<(target_arch_flag)', |
270 # TODO(sgk): may just use environment variables | 278 # TODO(sgk): may just use environment variables |
271 #'--distribution=$(CHROMIUM_BUILD)', | 279 #'--distribution=$(CHROMIUM_BUILD)', |
272 '--distribution=_google_chrome', | 280 '--distribution=_google_chrome', |
273 # Optional arguments to generate diff installer | 281 # Optional arguments to generate diff installer |
274 #'--last_chrome_installer=C:/Temp/base', | 282 #'--last_chrome_installer=C:/Temp/base', |
275 #'--setup_exe_format=DIFF', | 283 #'--setup_exe_format=DIFF', |
276 #'--diff_algorithm=COURGETTE', | 284 #'--diff_algorithm=COURGETTE', |
277 ], | 285 ], |
278 'message': 'Create installer archive', | 286 'message': 'Create installer archive', |
279 'msvs_cygwin_shell': 1, | 287 'msvs_cygwin_shell': 1, |
280 }, | 288 }, |
281 ], | 289 ], |
282 }, | 290 }, |
283 ], | 291 ], |
284 }], | 292 }], |
285 [ 'branding == "Chrome"', { | 293 [ 'branding == "Chrome"', { |
286 'variables': { | 294 'variables': { |
287 'branding_dir': '../app/theme/google_chrome', | 295 'branding_dir': '../app/theme/google_chrome', |
288 }, | 296 }, |
289 }, { # else branding!="Chrome" | 297 }, { # else branding!="Chrome" |
290 'variables': { | 298 'variables': { |
291 'branding_dir': '../app/theme/chromium', | 299 'branding_dir': '../app/theme/chromium', |
292 }, | 300 }, |
293 }], | 301 }], |
294 ], | 302 ], |
295 } | 303 } |
OLD | NEW |