OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 { | 4 { |
5 'dependencies': [ | 5 'dependencies': [ |
6 '<(chrome_dll_project)', | 6 '<(chrome_dll_project)', |
7 '../chrome.gyp:app_host', | 7 '../chrome.gyp:app_host', |
8 '../chrome.gyp:chrome', | 8 '../chrome.gyp:chrome', |
9 '../chrome.gyp:chrome_nacl_win64', | 9 '../chrome.gyp:chrome_nacl_win64', |
10 '../chrome.gyp:default_extensions', | 10 '../chrome.gyp:default_extensions', |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 }, { | 174 }, { |
175 'variables': { | 175 'variables': { |
176 'enable_touch_ui_flag': '', | 176 'enable_touch_ui_flag': '', |
177 }, | 177 }, |
178 }], | 178 }], |
179 ['target_arch=="x64"', { | 179 ['target_arch=="x64"', { |
180 'inputs!': [ | 180 'inputs!': [ |
181 '<(PRODUCT_DIR)/nacl64.exe', | 181 '<(PRODUCT_DIR)/nacl64.exe', |
182 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 182 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
183 ], | 183 ], |
| 184 'variables': { |
| 185 'target_arch_flag': '--target_arch=x64', |
| 186 }, |
| 187 }, { |
| 188 'variables': { |
| 189 'target_arch_flag': '--target_arch=x86', |
| 190 }, |
184 }], | 191 }], |
185 ], | 192 ], |
186 'inputs': [ | 193 'inputs': [ |
187 '<(create_installer_archive_py_path)', | 194 '<(create_installer_archive_py_path)', |
188 '<(PRODUCT_DIR)/app_host.exe', | 195 '<(PRODUCT_DIR)/app_host.exe', |
189 '<(PRODUCT_DIR)/chrome.exe', | 196 '<(PRODUCT_DIR)/chrome.exe', |
190 '<(chrome_dll_path)', | 197 '<(chrome_dll_path)', |
191 '<(PRODUCT_DIR)/nacl64.exe', | 198 '<(PRODUCT_DIR)/nacl64.exe', |
192 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 199 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
193 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 200 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
(...skipping 11 matching lines...) Expand all Loading... |
205 'action': [ | 212 'action': [ |
206 'python', | 213 'python', |
207 '<(create_installer_archive_py_path)', | 214 '<(create_installer_archive_py_path)', |
208 '--build_dir=<(PRODUCT_DIR)', | 215 '--build_dir=<(PRODUCT_DIR)', |
209 '--output_dir=<(output_dir)', | 216 '--output_dir=<(output_dir)', |
210 '--staging_dir=<(INTERMEDIATE_DIR)', | 217 '--staging_dir=<(INTERMEDIATE_DIR)', |
211 '--input_file=<(RULE_INPUT_PATH)', | 218 '--input_file=<(RULE_INPUT_PATH)', |
212 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc', | 219 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc', |
213 '<(enable_hidpi_flag)', | 220 '<(enable_hidpi_flag)', |
214 '<(enable_touch_ui_flag)', | 221 '<(enable_touch_ui_flag)', |
| 222 '<(target_arch_flag)', |
215 # TODO(sgk): may just use environment variables | 223 # TODO(sgk): may just use environment variables |
216 #'--distribution=$(CHROMIUM_BUILD)', | 224 #'--distribution=$(CHROMIUM_BUILD)', |
217 '--distribution=_google_chrome', | 225 '--distribution=_google_chrome', |
218 # Optional arguments to generate diff installer | 226 # Optional arguments to generate diff installer |
219 #'--last_chrome_installer=C:/Temp/base', | 227 #'--last_chrome_installer=C:/Temp/base', |
220 #'--setup_exe_format=DIFF', | 228 #'--setup_exe_format=DIFF', |
221 #'--diff_algorithm=COURGETTE', | 229 #'--diff_algorithm=COURGETTE', |
222 ], | 230 ], |
223 'message': 'Create installer archive' | 231 'message': 'Create installer archive' |
224 }, | 232 }, |
(...skipping 10 matching lines...) Expand all Loading... |
235 'variables': { | 243 'variables': { |
236 'branding_dir': '../app/theme/google_chrome', | 244 'branding_dir': '../app/theme/google_chrome', |
237 }, | 245 }, |
238 }, { # else branding!="Chrome" | 246 }, { # else branding!="Chrome" |
239 'variables': { | 247 'variables': { |
240 'branding_dir': '../app/theme/chromium', | 248 'branding_dir': '../app/theme/chromium', |
241 }, | 249 }, |
242 }], | 250 }], |
243 ], | 251 ], |
244 } | 252 } |
OLD | NEW |