diff options
| author | brettw <brettw@chromium.org> | 2015-07-21 09:15:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-21 16:17:11 +0000 |
| commit | c34cad367a0557d8b029fb81d04cc37b5979fee0 (patch) | |
| tree | fb99cf0f6904fb5acb87fcc1e200640c43595410 /cloud_print/service | |
| parent | eea93e8d5edfda2756504fe8f840f87d7f902961 (diff) | |
| download | chromium_src-c34cad367a0557d8b029fb81d04cc37b5979fee0.zip chromium_src-c34cad367a0557d8b029fb81d04cc37b5979fee0.tar.gz chromium_src-c34cad367a0557d8b029fb81d04cc37b5979fee0.tar.bz2 | |
Preliminary support for Windows manifests in the GN build.
Adds manifest data for content shell. The result matches the GYP build.
Attaches a default manifest to all tests in the GN build. The GYP build's tests have manifests that specify elevation only. In GN it also specifies Windows and common control compat that matches what we ship with Chrome.
Moved the common control compat files that were duplicated to a shared place in build/win, update cloud_print and remoting which had their own copies to use this shared one.
BUG=510612
Review URL: https://codereview.chromium.org/1240893004
Cr-Commit-Position: refs/heads/master@{#339663}
Diffstat (limited to 'cloud_print/service')
| -rw-r--r-- | cloud_print/service/win/common-controls.manifest | 8 | ||||
| -rw-r--r-- | cloud_print/service/win/service.gyp | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/cloud_print/service/win/common-controls.manifest b/cloud_print/service/win/common-controls.manifest deleted file mode 100644 index 1710196..0000000 --- a/cloud_print/service/win/common-controls.manifest +++ /dev/null @@ -1,8 +0,0 @@ -<?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/cloud_print/service/win/service.gyp b/cloud_print/service/win/service.gyp index 0019b6f..29aa3cf 100644 --- a/cloud_print/service/win/service.gyp +++ b/cloud_print/service/win/service.gyp @@ -68,7 +68,7 @@ 'msvs_settings': { 'VCManifestTool': { 'AdditionalManifestFiles': [ - 'common-controls.manifest', + '<(DEPTH)/build/win/common_controls.manifest', ], }, 'VCLinkerTool': { |