diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 21:06:28 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 21:06:28 +0000 |
| commit | ba63b66ac6547e7f69e8e29ec742a3526b93a4c9 (patch) | |
| tree | 633706a48aa72d1c6058f9f5456e7e66bcc066f3 /remoting | |
| parent | 1b8dc9944f65ef843862fcfcc16c067f5ae303b4 (diff) | |
| download | chromium_src-ba63b66ac6547e7f69e8e29ec742a3526b93a4c9.zip chromium_src-ba63b66ac6547e7f69e8e29ec742a3526b93a4c9.tar.gz chromium_src-ba63b66ac6547e7f69e8e29ec742a3526b93a4c9.tar.bz2 | |
Move remoting manifestdependency to external .manifest file
I plan (https://codereview.chromium.org/111373002/) to make manifest
handling simpler in gyp. In particular, doing the manifest embedding
in one pass to avoid the need to invoke the linker twice.
In order to do this /manifestdependency on the linker command line needs
to be removed as it creates dependencies that are only made clear by
having the linker generate a manifest. In this case it's simple enough
to simply use a .manifest file with the same dependency information that
can be merged beforehand.
So, move from .gyp linker flags to a file in AdditionalManifestFiles.
R=sergeyu@chromium.org
BUG=324863
Review URL: https://codereview.chromium.org/108303004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/win/common-controls.manifest | 8 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 31 |
2 files changed, 18 insertions, 21 deletions
diff --git a/remoting/host/win/common-controls.manifest b/remoting/host/win/common-controls.manifest new file mode 100644 index 0000000..1710196 --- /dev/null +++ b/remoting/host/win/common-controls.manifest @@ -0,0 +1,8 @@ +<?xml version='1.0' encoding='UTF-8' standalone='yes'?> +<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> + <dependency> + <dependentAssembly> + <assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*' /> + </dependentAssembly> + </dependency> +</assembly> diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index ae025ae..a93a8d2 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -735,14 +735,8 @@ 'msvs_settings': { 'VCManifestTool': { 'EmbedManifest': 'true', - }, - 'VCLinkerTool': { - 'AdditionalOptions': [ - "\"/manifestdependency:type='win32' " - "name='Microsoft.Windows.Common-Controls' " - "version='6.0.0.0' " - "processorArchitecture='*' " - "publicKeyToken='6595b64144ccf1df' language='*'\"", + 'AdditionalManifestFiles': [ + 'host/win/common-controls.manifest', ], }, }, @@ -1503,14 +1497,12 @@ 'host/setup/win/start_host_window.h', ], 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalOptions': [ - "\"/manifestdependency:type='win32' " - "name='Microsoft.Windows.Common-Controls' " - "version='6.0.0.0' " - "processorArchitecture='*' " - "publicKeyToken='6595b64144ccf1df' language='*'\"", + 'VCManifestTool': { + 'AdditionalManifestFiles': [ + 'host/win/common-controls.manifest', ], + }, + 'VCLinkerTool': { # 2 == /SUBSYSTEM:WINDOWS 'SubSystem': '2', }, @@ -1644,6 +1636,9 @@ 'msvs_settings': { 'VCManifestTool': { 'EmbedManifest': 'true', + 'AdditionalManifestFiles': [ + 'host/win/common-controls.manifest', + ], }, 'VCLinkerTool': { 'AdditionalDependencies': [ @@ -1654,12 +1649,6 @@ 'wtsapi32.lib', ], 'AdditionalOptions': [ - "\"/manifestdependency:type='win32' " - "name='Microsoft.Windows.Common-Controls' " - "version='6.0.0.0' " - "processorArchitecture='*' " - "publicKeyToken='6595b64144ccf1df' language='*'\"", - # Export the proxy/stub entry points. Note that the generated # routines have 'Ps' prefix to avoid conflicts with our own # DllMain(). |