Index: chrome/chrome_installer.gypi |
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi |
index a671e5922d35a2eb30b69719b0c64d9334c78c2f..8543946ce6e7997be7e1d689d8070f97164110ef 100644 |
--- a/chrome/chrome_installer.gypi |
+++ b/chrome/chrome_installer.gypi |
@@ -137,7 +137,9 @@ |
], |
'msvs_settings': { |
'VCManifestTool': { |
- 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest', |
+ 'AdditionalManifestFiles': [ |
+ '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest', |
+ ], |
}, |
}, |
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
@@ -233,7 +235,9 @@ |
], |
'msvs_settings': { |
'VCManifestTool': { |
- 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest', |
+ 'AdditionalManifestFiles': [ |
+ '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest', |
+ ], |
}, |
}, |
}, |
@@ -291,7 +295,9 @@ |
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
}, |
'VCManifestTool': { |
- 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', |
+ 'AdditionalManifestFiles': [ |
+ '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', |
+ ], |
}, |
}, |
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
@@ -353,10 +359,8 @@ |
], |
'conditions': [ |
['component == "shared_library"', { |
- 'msvs_settings': { |
- 'VCManifestTool': { |
- 'EmbedManifest': 'false', |
- }, |
+ 'variables': { |
+ 'win_use_external_manifest': 1, |
}, |
}], |
# TODO(mark): <(branding_dir) should be defined by the |