Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3926)

Unified Diff: chrome/installer/mini_installer.gyp

Issue 1902233003: Add next_version_mini_installer target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable for x86/Debug/component builds Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/gn_migration.gypi ('k') | chrome/installer/mini_installer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer.gyp
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index cdb5227b4dc1709febd30d949a2b6e84508eb839..4bf290481ffa845e52f2b4a03231dc1294b5c794 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -26,7 +26,7 @@
'includes': [
'mini_installer.gypi',
],
- }
+ },
],
'conditions': [
['test_isolation_mode != "noop"', {
@@ -46,6 +46,44 @@
},
],
}],
+ # next_version_mini_installer.exe can't be generated in an x86 Debug
+ # component build because it requires too much memory. Don't define the
+ # target for any x86 component build since gyp doesn't allow use of the
+ # configuration name in conditionals.
+ ['component!="shared_library" or target_arch!="ia32"', {
+ 'targets': [
+ {
+ # GN version: //chrome/installer/mini_installer:next_version_mini_installer
+ 'target_name': 'next_version_mini_installer',
+ 'type': 'none',
+ 'dependencies': [
+ 'mini_installer',
+ '<(DEPTH)/chrome/installer/upgrade_test.gyp:alternate_version_generator',
+ ],
+ 'variables': {
+ 'alternate_version_generator_exe': 'alternate_version_generator.exe',
+ 'next_version_mini_installer_exe': 'next_version_mini_installer.exe',
+ },
+ 'actions': [
+ {
+ 'action_name': 'generate_next_version_mini_installer',
+ 'inputs': [
+ '<(PRODUCT_DIR)/<(alternate_version_generator_exe)',
+ '<(PRODUCT_DIR)/mini_installer.exe',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/next_version_mini_installer.exe',
+ ],
+ 'action': [
+ '<(PRODUCT_DIR)/<(alternate_version_generator_exe)',
+ '--force',
+ '--out=<(PRODUCT_DIR)/<(next_version_mini_installer_exe)',
+ ],
+ }
+ ],
+ },
+ ],
+ }],
],
}],
],
« no previous file with comments | « build/gn_migration.gypi ('k') | chrome/installer/mini_installer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698