Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 51436bf4b2455cf6ad73ffb6d057d84cc2af3eda..b0ad2b7db387f8581a8e14084c1e9246d0886c11 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -2054,12 +2054,6 @@ |
'win_exe_compatibility_manifest%': |
'<(DEPTH)\\build\\win\\compatibility.manifest', |
- # Set to 1 to generate external manifest instead of embedding it for |
- # 'executable' target. Does nothing for other target type. This flag is |
- # used to make mini_installer compatible with the component build. |
- # See http://crbug.com/127233 |
- 'win_use_external_manifest%': 0, |
- |
'release_extra_cflags%': '', |
'debug_extra_cflags%': '', |
@@ -4726,6 +4720,11 @@ |
], |
}, |
'target_conditions': [ |
+ ['_type=="executable"', { |
+ 'VCManifestTool': { |
+ 'EmbedManifest': 'true', |
+ }, |
+ }], |
['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""', { |
'VCManifestTool': { |
'AdditionalManifestFiles': [ |
@@ -4733,16 +4732,6 @@ |
], |
}, |
}], |
- ['_type=="executable" and >(win_use_external_manifest)==0', { |
- 'VCManifestTool': { |
- 'EmbedManifest': 'true', |
- } |
- }], |
- ['_type=="executable" and >(win_use_external_manifest)==1', { |
- 'VCManifestTool': { |
- 'EmbedManifest': 'false', |
- } |
- }], |
], |
'conditions': [ |
['clang==1', { |