Skip to content

Commit

Permalink
Move cloud_print manifestdependency to external .manifest file
Browse files Browse the repository at this point in the history
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=vitalybuka@chromium.org
BUG=324863

Review URL: https://codereview.chromium.org/108813005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240189 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
scottmg@chromium.org committed Dec 11, 2013
1 parent 559eec2 commit c1a2b23
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
8 changes: 8 additions & 0 deletions cloud_print/service/common-controls.manifest
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 5 additions & 7 deletions cloud_print/service/service.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,17 @@
'cloud_print_service_lib',
],
'msvs_settings': {
'VCManifestTool': {
'AdditionalManifestFiles': [
'common-controls.manifest',
],
},
'VCLinkerTool': {
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
'UACExecutionLevel': '2', # /level='requireAdministrator'
'AdditionalDependencies': [
'secur32.lib',
],
'AdditionalOptions': [ # Enable Vista+ look.
"\"/manifestdependency:type='win32' "
"name='Microsoft.Windows.Common-Controls' "
"version='6.0.0.0' "
"processorArchitecture='*' "
"publicKeyToken='6595b64144ccf1df' language='*'\"",
],
},
},
},
Expand Down

0 comments on commit c1a2b23

Please sign in to comment.