| 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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 ['test_isolation_mode != "noop"', { | 287 ['test_isolation_mode != "noop"', { |
| 288 'targets': [ | 288 'targets': [ |
| 289 { | 289 { |
| 290 'target_name': 'mini_installer_tests_run', | 290 'target_name': 'mini_installer_tests_run', |
| 291 'type': 'none', | 291 'type': 'none', |
| 292 'dependencies': [ | 292 'dependencies': [ |
| 293 'mini_installer', | 293 'mini_installer', |
| 294 ], | 294 ], |
| 295 'includes': [ | 295 'includes': [ |
| 296 '../../build/isolate.gypi', | 296 '../../build/isolate.gypi', |
| 297 'mini_installer_tests.isolate', | |
| 298 ], | 297 ], |
| 299 'sources': [ | 298 'sources': [ |
| 300 'mini_installer_tests.isolate', | 299 'mini_installer_tests.isolate', |
| 301 ], | 300 ], |
| 302 }, | 301 }, |
| 303 ], | 302 ], |
| 304 }], | 303 }], |
| 305 ], | 304 ], |
| 306 }], | 305 }], |
| 307 [ 'branding == "Chrome"', { | 306 [ 'branding == "Chrome"', { |
| 308 'variables': { | 307 'variables': { |
| 309 'branding_dir': '../app/theme/google_chrome', | 308 'branding_dir': '../app/theme/google_chrome', |
| 310 }, | 309 }, |
| 311 }, { # else branding!="Chrome" | 310 }, { # else branding!="Chrome" |
| 312 'variables': { | 311 'variables': { |
| 313 'branding_dir': '../app/theme/chromium', | 312 'branding_dir': '../app/theme/chromium', |
| 314 }, | 313 }, |
| 315 }], | 314 }], |
| 316 ], | 315 ], |
| 317 } | 316 } |
| OLD | NEW |