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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 225 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
226 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 226 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
227 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 227 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
228 ], | 228 ], |
229 }], | 229 }], |
230 ['target_arch=="x64"', { | 230 ['target_arch=="x64"', { |
231 'inputs!': [ | 231 'inputs!': [ |
232 '<(PRODUCT_DIR)/nacl64.exe', | 232 '<(PRODUCT_DIR)/nacl64.exe', |
233 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 233 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
234 ], | 234 ], |
| 235 'variables': { |
| 236 'target_arch_flag': '--target_arch=x64', |
| 237 }, |
| 238 }, { |
| 239 'variables': { |
| 240 'target_arch_flag': '--target_arch=x86', |
| 241 }, |
235 }], | 242 }], |
236 ], | 243 ], |
237 'inputs': [ | 244 'inputs': [ |
238 '<(create_installer_archive_py_path)', | 245 '<(create_installer_archive_py_path)', |
239 '<(PRODUCT_DIR)/app_host.exe', | 246 '<(PRODUCT_DIR)/app_host.exe', |
240 '<(PRODUCT_DIR)/chrome.exe', | 247 '<(PRODUCT_DIR)/chrome.exe', |
241 '<(PRODUCT_DIR)/chrome.dll', | 248 '<(PRODUCT_DIR)/chrome.dll', |
242 '<(PRODUCT_DIR)/nacl64.exe', | 249 '<(PRODUCT_DIR)/nacl64.exe', |
243 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 250 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
244 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 251 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
(...skipping 12 matching lines...) Expand all Loading... |
257 'action': [ | 264 'action': [ |
258 'python', | 265 'python', |
259 '<(create_installer_archive_py_path)', | 266 '<(create_installer_archive_py_path)', |
260 '--build_dir', '<(PRODUCT_DIR)', | 267 '--build_dir', '<(PRODUCT_DIR)', |
261 '--staging_dir', '<(INTERMEDIATE_DIR)', | 268 '--staging_dir', '<(INTERMEDIATE_DIR)', |
262 '--input_file', '<(RULE_INPUT_PATH)', | 269 '--input_file', '<(RULE_INPUT_PATH)', |
263 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', | 270 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
264 '<(enable_hidpi_flag)', | 271 '<(enable_hidpi_flag)', |
265 '<(enable_touch_ui_flag)', | 272 '<(enable_touch_ui_flag)', |
266 '<(component_build_flag)', | 273 '<(component_build_flag)', |
| 274 '<(target_arch_flag)', |
267 # TODO(sgk): may just use environment variables | 275 # TODO(sgk): may just use environment variables |
268 #'--distribution=$(CHROMIUM_BUILD)', | 276 #'--distribution=$(CHROMIUM_BUILD)', |
269 '--distribution=_google_chrome', | 277 '--distribution=_google_chrome', |
270 # Optional arguments to generate diff installer | 278 # Optional arguments to generate diff installer |
271 #'--last_chrome_installer=C:/Temp/base', | 279 #'--last_chrome_installer=C:/Temp/base', |
272 #'--setup_exe_format=DIFF', | 280 #'--setup_exe_format=DIFF', |
273 #'--diff_algorithm=COURGETTE', | 281 #'--diff_algorithm=COURGETTE', |
274 ], | 282 ], |
275 'message': 'Create installer archive', | 283 'message': 'Create installer archive', |
276 'msvs_cygwin_shell': 1, | 284 'msvs_cygwin_shell': 1, |
277 }, | 285 }, |
278 ], | 286 ], |
279 }, | 287 }, |
280 ], | 288 ], |
281 }], | 289 }], |
282 [ 'branding == "Chrome"', { | 290 [ 'branding == "Chrome"', { |
283 'variables': { | 291 'variables': { |
284 'branding_dir': '../app/theme/google_chrome', | 292 'branding_dir': '../app/theme/google_chrome', |
285 }, | 293 }, |
286 }, { # else branding!="Chrome" | 294 }, { # else branding!="Chrome" |
287 'variables': { | 295 'variables': { |
288 'branding_dir': '../app/theme/chromium', | 296 'branding_dir': '../app/theme/chromium', |
289 }, | 297 }, |
290 }], | 298 }], |
291 ], | 299 ], |
292 } | 300 } |
OLD | NEW |