diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 20:05:24 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 20:05:24 +0000 |
| commit | 6316fb08020556639cedc83d02b7d23014f96029 (patch) | |
| tree | 0fad5dd8875ad24af0341c153a01f117b8a9d868 /chrome/chrome_exe.gypi | |
| parent | 4ff74cc77fc2bd0ef8fa1148fb495ff86ac792f6 (diff) | |
| download | chromium_src-6316fb08020556639cedc83d02b7d23014f96029.zip chromium_src-6316fb08020556639cedc83d02b7d23014f96029.tar.gz chromium_src-6316fb08020556639cedc83d02b7d23014f96029.tar.bz2 | |
Refactor manifests to allow all executables to use the same base manifests as AdditionalManifestFiles
Introduce additional.manifest with app compatibility guids and UAC asInvoker property (this is the same as the old chrome.exe.manifest, but without the non-common parts, see chrome.manifest below).
Introduce chrome.manifest to keep a property that was set in the previous chrome.(exe|dll).manifest to declare usage of ComCtl32.dll version 6 as is required per http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175(v=vs.85).aspx to get visual styles.
BUG=127765 (not really fixing it, but a follow up to the CL for it)
TEST=Manifests embedded in chrome.exe, chrome.dll, setup.exe, mini_installer.exe in a VS2010 static build are the exact same as before.
Review URL: https://chromiumcodereview.appspot.com/10879020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 9909ed4..ada39ba 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -24,6 +24,8 @@ 'app/chrome_exe_resource.h', 'app/client_util.cc', 'app/client_util.h', + 'app/additional.manifest', + 'app/chrome.manifest', 'app/hard_error_handler_win.cc', 'app/hard_error_handler_win.h', 'app/metro_driver_win.cc', @@ -485,7 +487,7 @@ 'SubSystem': '2', }, 'VCManifestTool': { - 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manifest', + 'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest;$(ProjectDir)\\app\\chrome.manifest', }, }, 'actions': [ |