summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorYukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 20:24:30 +0000
committerYukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 20:24:30 +0000
commit5d60b0b9ddbab9d3cfc66aaf31ba03a1154382c1 (patch)
treeea277dfe39ab8c6052c25b2a1e3bea2e2b225f2a /chrome_frame
parent16f2ab1136cc0771dc57252c7542c9500355879c (diff)
downloadchromium_src-5d60b0b9ddbab9d3cfc66aaf31ba03a1154382c1.zip
chromium_src-5d60b0b9ddbab9d3cfc66aaf31ba03a1154382c1.tar.gz
chromium_src-5d60b0b9ddbab9d3cfc66aaf31ba03a1154382c1.tar.bz2
Embed compatibility manifest into all *.exe files
This CL introduces an automated and centralized way to embed compatibility manifest into all *.exe files. With this CL, a potential risk of behavioural inconsistency between production binaries and unit test binaries is resolved by enforcing the same compatibility context. This CL uses 'target_conditions' feature of gyp to inject manifest settings into each executable target. One tricky part is that some executables such as setup.exe and mini_installer.exe require external manifest file instead of embedded one when component build is enabled. See http://crbug.com/127233 for this. You can override the gyp variable 'win_exe_compatibility_manifest' locally for a given executable target to embed a custom compatibility manifest. BUG=260692 Review URL: https://chromiumcodereview.appspot.com/19275010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index fa5bae3..4225df5 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -952,8 +952,9 @@
'SubSystem': '2',
},
'VCManifestTool': {
- 'AdditionalManifestFiles':
- '$(ProjectDir)\\resources\\npchrome_frame.dll.manifest',
+ 'AdditionalManifestFiles': [
+ '$(ProjectDir)\\resources\\npchrome_frame.dll.manifest',
+ ],
},
},
}],