Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 8b616df98277abd9897e07bb764551bccfaeba14..359827bd55a35f6c88a7fd4e1ee313871fb37958 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -2056,12 +2056,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%': '', |
@@ -4713,6 +4707,11 @@ |
'<(SHARED_INTERMEDIATE_DIR)', |
], |
}, |
+ # The manifests are now always embedded as resources post-link rather |
+ # than via MSVC. |
+ 'VCManifestTool': { |
+ 'EmbedManifest': 'false', |
scottmg
2014/02/25 23:04:23
This should still be true, gyp still respects this
gab
2014/02/25 23:08:35
Indeed, whoops, also removed redundancy in remotin
|
+ }, |
'target_conditions': [ |
['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""', { |
'VCManifestTool': { |
@@ -4721,16 +4720,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', { |