| 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 ], | 30 ], |
| 31 'conditions': [ | 31 'conditions': [ |
| 32 ['test_isolation_mode != "noop"', { | 32 ['test_isolation_mode != "noop"', { |
| 33 'targets': [ | 33 'targets': [ |
| 34 { | 34 { |
| 35 'target_name': 'mini_installer_tests_run', | 35 'target_name': 'mini_installer_tests_run', |
| 36 'type': 'none', | 36 'type': 'none', |
| 37 'dependencies': [ | 37 'dependencies': [ |
| 38 'mini_installer', | 38 'mini_installer', |
| 39 ], | 39 ], |
| 40 'includes': [ | 40 'includes': [ |
| 41 '../../build/isolate.gypi', | 41 '../../build/isolate.gypi', |
| 42 ], | 42 ], |
| 43 'sources': [ | 43 'sources': [ |
| 44 'mini_installer_tests.isolate', | 44 'mini_installer_tests.isolate', |
| 45 ], | 45 ], |
| 46 }, | 46 }, |
| 47 ], | 47 ], |
| 48 }], | 48 }], |
| 49 # next_version_mini_installer.exe can't be generated in an x86 Debug | |
| 50 # component build because it requires too much memory. Don't define the | |
| 51 # target for any x86 component build since gyp doesn't allow use of the | |
| 52 # configuration name in conditionals. | |
| 53 ['component!="shared_library" or target_arch!="ia32"', { | |
| 54 'targets': [ | |
| 55 { | |
| 56 # GN version: //chrome/installer/mini_installer:next_version_mini_
installer | |
| 57 'target_name': 'next_version_mini_installer', | |
| 58 'type': 'none', | |
| 59 'dependencies': [ | |
| 60 'mini_installer', | |
| 61 '<(DEPTH)/chrome/installer/upgrade_test.gyp:alternate_version_ge
nerator', | |
| 62 ], | |
| 63 'variables': { | |
| 64 'alternate_version_generator_exe': 'alternate_version_generator.
exe', | |
| 65 'next_version_mini_installer_exe': 'next_version_mini_installer.
exe', | |
| 66 }, | |
| 67 'actions': [ | |
| 68 { | |
| 69 'action_name': 'generate_next_version_mini_installer', | |
| 70 'inputs': [ | |
| 71 '<(PRODUCT_DIR)/<(alternate_version_generator_exe)', | |
| 72 '<(PRODUCT_DIR)/mini_installer.exe', | |
| 73 ], | |
| 74 'outputs': [ | |
| 75 '<(PRODUCT_DIR)/next_version_mini_installer.exe', | |
| 76 ], | |
| 77 'action': [ | |
| 78 '<(PRODUCT_DIR)/<(alternate_version_generator_exe)', | |
| 79 '--force', | |
| 80 '--out=<(PRODUCT_DIR)/<(next_version_mini_installer_exe)', | |
| 81 ], | |
| 82 } | |
| 83 ], | |
| 84 }, | |
| 85 ], | |
| 86 }], | |
| 87 ], | 49 ], |
| 88 }], | 50 }], |
| 89 ], | 51 ], |
| 90 } | 52 } |
| OLD | NEW |