diff options
| author | Yukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 07:21:46 +0000 |
|---|---|---|
| committer | Yukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 07:21:46 +0000 |
| commit | 6f59107ee9d1ca2927ed1caf53f2e9d25a254959 (patch) | |
| tree | 326e0b41a5971565dc5bee0c22d83f425ee563b4 /chrome/installer | |
| parent | e4f1a1f38b8a33123e8077ec60a92f382fd2d02f (diff) | |
| download | chromium_src-6f59107ee9d1ca2927ed1caf53f2e9d25a254959.zip chromium_src-6f59107ee9d1ca2927ed1caf53f2e9d25a254959.tar.gz chromium_src-6f59107ee9d1ca2927ed1caf53f2e9d25a254959.tar.bz2 | |
Move compatibility section back to mini_installer.exe.manifest
This is a minimal CL to fix Issue 272660 in M30 time frame.
With this CL, mini_installer.exe.manifest becomes
standalone again so that the code signing rule can embed
the appropriate compatibility section into the application
manifest.
I'm planning to fix the code signing rule as Issue 273449.
BUG=272660, 273449
Review URL: https://chromiumcodereview.appspot.com/22805005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 8 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.exe.manifest | 19 |
2 files changed, 25 insertions, 2 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 05d54d2..619c70e 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -177,7 +177,13 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], - + + 'variables': { + # Opt out the common compatibility manifest to work around + # crbug.com/272660. + # TODO(yukawa): Enable the common compatibility manifest again. + 'win_exe_compatibility_manifest': '', + }, 'sources': [ 'mini_installer/chrome.release', 'mini_installer/chrome_appid.cc', diff --git a/chrome/installer/mini_installer/mini_installer.exe.manifest b/chrome/installer/mini_installer/mini_installer.exe.manifest index afb780f..8ff4c45 100644 --- a/chrome/installer/mini_installer/mini_installer.exe.manifest +++ b/chrome/installer/mini_installer/mini_installer.exe.manifest @@ -1,6 +1,23 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <!--The compatibility section will be merged from build/win/compatibility.manifest --> + <!-- + Have compatibility section here instead of using + build/win/compatibility.manifest + to work around crbug.com/272660. + TODO(yukawa): Use build/win/compatibility.manifest again. + --> + <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> <ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2"> <ms_asmv2:security> <ms_asmv2:requestedPrivileges> |