| 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 'outputs': [ | 218 'outputs': [ |
| 219 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | 219 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', |
| 220 ], | 220 ], |
| 221 }], | 221 }], |
| 222 ['disable_nacl==1', { | 222 ['disable_nacl==1', { |
| 223 'inputs!': [ | 223 'inputs!': [ |
| 224 '<(PRODUCT_DIR)/nacl64.exe', | 224 '<(PRODUCT_DIR)/nacl64.exe', |
| 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 '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', | 228 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe', |
| 229 '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe', | 229 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe', |
| 230 ], | 230 ], |
| 231 }], | 231 }], |
| 232 ], | 232 ], |
| 233 'inputs': [ | 233 'inputs': [ |
| 234 '<(create_installer_archive_py_path)', | 234 '<(create_installer_archive_py_path)', |
| 235 '<(PRODUCT_DIR)/app_host.exe', | 235 '<(PRODUCT_DIR)/app_host.exe', |
| 236 '<(PRODUCT_DIR)/chrome.exe', | 236 '<(PRODUCT_DIR)/chrome.exe', |
| 237 '<(PRODUCT_DIR)/chrome.dll', | 237 '<(PRODUCT_DIR)/chrome.dll', |
| 238 '<(PRODUCT_DIR)/nacl64.exe', | 238 '<(PRODUCT_DIR)/nacl64.exe', |
| 239 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 239 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
| 240 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 240 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 241 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 241 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 242 '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', | 242 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe', |
| 243 '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe', | 243 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe', |
| 244 '<(PRODUCT_DIR)/locales/en-US.pak', | 244 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 245 '<(PRODUCT_DIR)/icudt.dll', | 245 '<(PRODUCT_DIR)/icudt.dll', |
| 246 ], | 246 ], |
| 247 'outputs': [ | 247 'outputs': [ |
| 248 # Also note that chrome.packed.7z is defined as an output in a | 248 # Also note that chrome.packed.7z is defined as an output in a |
| 249 # conditional above. | 249 # conditional above. |
| 250 'xxx2.out', | 250 'xxx2.out', |
| 251 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | 251 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', |
| 252 '<(PRODUCT_DIR)/setup.ex_', | 252 '<(PRODUCT_DIR)/setup.ex_', |
| 253 '<(INTERMEDIATE_DIR)/packed_files.rc', | 253 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| (...skipping 26 matching lines...) Expand all Loading... |
| 280 'variables': { | 280 'variables': { |
| 281 'branding_dir': '../app/theme/google_chrome', | 281 'branding_dir': '../app/theme/google_chrome', |
| 282 }, | 282 }, |
| 283 }, { # else branding!="Chrome" | 283 }, { # else branding!="Chrome" |
| 284 'variables': { | 284 'variables': { |
| 285 'branding_dir': '../app/theme/chromium', | 285 'branding_dir': '../app/theme/chromium', |
| 286 }, | 286 }, |
| 287 }], | 287 }], |
| 288 ], | 288 ], |
| 289 } | 289 } |
| OLD | NEW |