| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'chromium_code': 1, | 3 'chromium_code': 1, |
| 4 'msvs_use_common_release': 0, | 4 'msvs_use_common_release': 0, |
| 5 'msvs_use_common_linker_extras': 0, | 5 'msvs_use_common_linker_extras': 0, |
| 6 'mini_installer_internal_deps%': 0, | 6 'mini_installer_internal_deps%': 0, |
| 7 'mini_installer_official_deps%': 0, | 7 'mini_installer_official_deps%': 0, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../../build/win_precompile.gypi', | 10 '../../build/win_precompile.gypi', |
| 11 ], | 11 ], |
| 12 'conditions': [ | 12 'conditions': [ |
| 13 ['OS=="win"', { | 13 ['OS=="win"', { |
| 14 'targets': [ | 14 'targets': [ |
| 15 { | 15 { |
| 16 'target_name': 'mini_installer', | 16 'target_name': 'mini_installer', |
| 17 'variables': { | 17 'variables': { |
| 18 'chrome_dll_project': [ | 18 'chrome_dll_project': [ |
| 19 '../chrome.gyp:chrome_dll', | 19 '../chrome.gyp:chrome_dll', |
| 20 ], | 20 ], |
| 21 'chrome_dll_path': [ | 21 'chrome_dll_path': [ |
| 22 '<(PRODUCT_DIR)/chrome.dll', | 22 '<(PRODUCT_DIR)/chrome.dll', |
| 23 ], | 23 ], |
| 24 'output_dir': '<(PRODUCT_DIR)', | 24 'output_dir': '<(PRODUCT_DIR)', |
| 25 }, | 25 }, |
| 26 'includes': [ | 26 'includes': [ |
| 27 'mini_installer.gypi', | 27 'mini_installer.gypi', |
| 28 ], | 28 ], |
| 29 } | 29 }, |
| 30 { |
| 31 'target_name': 'next_version_mini_installer', |
| 32 'type': 'none', |
| 33 'dependencies': [ |
| 34 'mini_installer', |
| 35 '<(DEPTH)/chrome/installer/upgrade_test.gyp:alternate_version_genera
tor', |
| 36 ], |
| 37 'variables': { |
| 38 'alternate_version_generator_exe': 'alternate_version_generator.exe'
, |
| 39 'next_version_mini_installer_exe': 'next_version_mini_installer.exe'
, |
| 40 }, |
| 41 'actions': [ |
| 42 { |
| 43 'action_name': 'generate_next_version_mini_installer', |
| 44 'inputs': [ |
| 45 '<(PRODUCT_DIR)/<(alternate_version_generator_exe)', |
| 46 '<(PRODUCT_DIR)/mini_installer.exe', |
| 47 ], |
| 48 'outputs': [ |
| 49 '<(PRODUCT_DIR)/next_version_mini_installer.exe', |
| 50 ], |
| 51 'action': [ |
| 52 '<(PRODUCT_DIR)/<(alternate_version_generator_exe)', |
| 53 '--force', |
| 54 '--out=<(PRODUCT_DIR)/<(next_version_mini_installer_exe)', |
| 55 ], |
| 56 } |
| 57 ], |
| 58 }, |
| 30 ], | 59 ], |
| 31 'conditions': [ | 60 'conditions': [ |
| 32 ['test_isolation_mode != "noop"', { | 61 ['test_isolation_mode != "noop"', { |
| 33 'targets': [ | 62 'targets': [ |
| 34 { | 63 { |
| 35 'target_name': 'mini_installer_tests_run', | 64 'target_name': 'mini_installer_tests_run', |
| 36 'type': 'none', | 65 'type': 'none', |
| 37 'dependencies': [ | 66 'dependencies': [ |
| 38 'mini_installer', | 67 'mini_installer', |
| 39 ], | 68 ], |
| 40 'includes': [ | 69 'includes': [ |
| 41 '../../build/isolate.gypi', | 70 '../../build/isolate.gypi', |
| 42 ], | 71 ], |
| 43 'sources': [ | 72 'sources': [ |
| 44 'mini_installer_tests.isolate', | 73 'mini_installer_tests.isolate', |
| 45 ], | 74 ], |
| 46 }, | 75 }, |
| 47 ], | 76 ], |
| 48 }], | 77 }], |
| 49 ], | 78 ], |
| 50 }], | 79 }], |
| 51 ], | 80 ], |
| 52 } | 81 } |
| OLD | NEW |