OLD | NEW |
---|---|
1 { | 1 { |
2 'variables': { | 2 'variables': { |
3 'version_py': '<(DEPTH)/build/util/version.py', | 3 'version_py': '<(DEPTH)/build/util/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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
221 }, { # else icu_use_data_file_flag != 0 | 221 }, { # else icu_use_data_file_flag != 0 |
222 'inputs': [ | 222 'inputs': [ |
223 '<(PRODUCT_DIR)/icudtl.dat', | 223 '<(PRODUCT_DIR)/icudtl.dat', |
224 ], | 224 ], |
225 }], | 225 }], |
226 ], | 226 ], |
227 'inputs': [ | 227 'inputs': [ |
228 '<(create_installer_archive_py_path)', | 228 '<(create_installer_archive_py_path)', |
229 '<(PRODUCT_DIR)/chrome.exe', | 229 '<(PRODUCT_DIR)/chrome.exe', |
230 '<(PRODUCT_DIR)/chrome.dll', | 230 '<(PRODUCT_DIR)/chrome.dll', |
231 '<(PRODUCT_DIR)/mojo_system.dll', | |
grt (UTC plus 2)
2014/03/19 00:59:03
is the intent here for mojo_system.dll to be inclu
sky
2014/03/19 15:04:10
Yes, mojo_system.dll needs to be part of the insta
| |
231 '<(PRODUCT_DIR)/nacl64.exe', | 232 '<(PRODUCT_DIR)/nacl64.exe', |
232 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 233 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
233 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 234 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
234 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 235 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
235 '<(PRODUCT_DIR)/locales/en-US.pak', | 236 '<(PRODUCT_DIR)/locales/en-US.pak', |
236 ], | 237 ], |
237 'outputs': [ | 238 'outputs': [ |
238 # Also note that chrome.packed.7z is defined as an output in a | 239 # Also note that chrome.packed.7z is defined as an output in a |
239 # conditional above. | 240 # conditional above. |
240 'xxx2.out', | 241 'xxx2.out', |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
308 'variables': { | 309 'variables': { |
309 'branding_dir': '../app/theme/google_chrome', | 310 'branding_dir': '../app/theme/google_chrome', |
310 }, | 311 }, |
311 }, { # else branding!="Chrome" | 312 }, { # else branding!="Chrome" |
312 'variables': { | 313 'variables': { |
313 'branding_dir': '../app/theme/chromium', | 314 'branding_dir': '../app/theme/chromium', |
314 }, | 315 }, |
315 }], | 316 }], |
316 ], | 317 ], |
317 } | 318 } |
OLD | NEW |