| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 'variables': { | 191 'variables': { |
| 192 'component_build_flag': '', | 192 'component_build_flag': '', |
| 193 }, | 193 }, |
| 194 'outputs': [ | 194 'outputs': [ |
| 195 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | 195 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', |
| 196 ], | 196 ], |
| 197 }], | 197 }], |
| 198 ['disable_nacl==1', { | 198 ['disable_nacl==1', { |
| 199 'inputs!': [ | 199 'inputs!': [ |
| 200 '<(PRODUCT_DIR)/nacl64.exe', | 200 '<(PRODUCT_DIR)/nacl64.exe', |
| 201 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | |
| 202 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 201 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 203 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 202 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 204 ], | 203 ], |
| 205 }], | 204 }], |
| 206 ['target_arch=="x64"', { | 205 ['target_arch=="x64"', { |
| 207 'inputs!': [ | 206 'inputs!': [ |
| 208 '<(PRODUCT_DIR)/nacl64.exe', | 207 '<(PRODUCT_DIR)/nacl64.exe', |
| 209 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 208 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 210 ], | 209 ], |
| 211 'variables': { | 210 'variables': { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 224 'inputs': [ | 223 'inputs': [ |
| 225 '<(PRODUCT_DIR)/icudtl.dat', | 224 '<(PRODUCT_DIR)/icudtl.dat', |
| 226 ], | 225 ], |
| 227 }], | 226 }], |
| 228 ], | 227 ], |
| 229 'inputs': [ | 228 'inputs': [ |
| 230 '<(create_installer_archive_py_path)', | 229 '<(create_installer_archive_py_path)', |
| 231 '<(PRODUCT_DIR)/chrome.exe', | 230 '<(PRODUCT_DIR)/chrome.exe', |
| 232 '<(PRODUCT_DIR)/chrome.dll', | 231 '<(PRODUCT_DIR)/chrome.dll', |
| 233 '<(PRODUCT_DIR)/nacl64.exe', | 232 '<(PRODUCT_DIR)/nacl64.exe', |
| 234 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | |
| 235 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 233 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 236 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 234 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 237 '<(PRODUCT_DIR)/locales/en-US.pak', | 235 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 238 ], | 236 ], |
| 239 'outputs': [ | 237 'outputs': [ |
| 240 # Also note that chrome.packed.7z is defined as an output in a | 238 # Also note that chrome.packed.7z is defined as an output in a |
| 241 # conditional above. | 239 # conditional above. |
| 242 'xxx2.out', | 240 'xxx2.out', |
| 243 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | 241 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', |
| 244 '<(PRODUCT_DIR)/setup.ex_', | 242 '<(PRODUCT_DIR)/setup.ex_', |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 'variables': { | 308 'variables': { |
| 311 'branding_dir': '../app/theme/google_chrome', | 309 'branding_dir': '../app/theme/google_chrome', |
| 312 }, | 310 }, |
| 313 }, { # else branding!="Chrome" | 311 }, { # else branding!="Chrome" |
| 314 'variables': { | 312 'variables': { |
| 315 'branding_dir': '../app/theme/chromium', | 313 'branding_dir': '../app/theme/chromium', |
| 316 }, | 314 }, |
| 317 }], | 315 }], |
| 318 ], | 316 ], |
| 319 } | 317 } |
| OLD | NEW |