| 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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 #'--last_chrome_installer=C:/Temp/base', | 273 #'--last_chrome_installer=C:/Temp/base', |
| 274 #'--setup_exe_format=DIFF', | 274 #'--setup_exe_format=DIFF', |
| 275 #'--diff_algorithm=COURGETTE', | 275 #'--diff_algorithm=COURGETTE', |
| 276 ], | 276 ], |
| 277 'message': 'Create installer archive' | 277 'message': 'Create installer archive' |
| 278 }, | 278 }, |
| 279 ], | 279 ], |
| 280 }, | 280 }, |
| 281 ], | 281 ], |
| 282 }], | 282 }], |
| 283 [ 'mini_installer_internal_deps == 1 or mini_installer_official_deps == 1',
{ | |
| 284 'target_defaults': { | |
| 285 'dependencies': [ | |
| 286 'mini_installer/support/mini_installer_support.gyp:*', | |
| 287 ], | |
| 288 }, | |
| 289 }], | |
| 290 [ 'branding == "Chrome"', { | 283 [ 'branding == "Chrome"', { |
| 291 'variables': { | 284 'variables': { |
| 292 'branding_dir': '../app/theme/google_chrome', | 285 'branding_dir': '../app/theme/google_chrome', |
| 293 }, | 286 }, |
| 294 }, { # else branding!="Chrome" | 287 }, { # else branding!="Chrome" |
| 295 'variables': { | 288 'variables': { |
| 296 'branding_dir': '../app/theme/chromium', | 289 'branding_dir': '../app/theme/chromium', |
| 297 }, | 290 }, |
| 298 }], | 291 }], |
| 299 ], | 292 ], |
| 300 } | 293 } |
| OLD | NEW |