summaryrefslogtreecommitdiffstats
path: root/chrome/app
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/app
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/app')
-rw-r--r--chrome/app/chrome.exe.manifest19
1 files changed, 4 insertions, 15 deletions
diff --git a/chrome/app/chrome.exe.manifest b/chrome/app/chrome.exe.manifest
index 82fe69b..d36f084 100644
--- a/chrome/app/chrome.exe.manifest
+++ b/chrome/app/chrome.exe.manifest
@@ -1,25 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <!--The ID below indicates application support for Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
- <!--The ID below indicates application support for Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
- <!--The ID below indicates application support for Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
- <!--The ID below indicates application support for Windows 8.1 -->
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- </application>
- </compatibility>
-
+ <!--The compatibility section will be merged from build/win/compatibility.manifest -->
+
<dependency>
<dependentAssembly>
<assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
</dependentAssembly>
</dependency>
-
+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
@@ -27,5 +16,5 @@
</requestedPrivileges>
</security>
</trustInfo>
-
+
</assembly>