summaryrefslogtreecommitdiffstats
path: root/build/win
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-10-14 12:51:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-14 19:52:52 +0000
commit70d2f990df7755c6e76aa20f156ff1f92a25f318 (patch)
tree90e9e01f070cd48f4fa78aaad78eb7eddd79d7ca /build/win
parent64d5a3960b67257d9e75496ff1c2d296c9c8c94b (diff)
downloadchromium_src-70d2f990df7755c6e76aa20f156ff1f92a25f318.zip
chromium_src-70d2f990df7755c6e76aa20f156ff1f92a25f318.tar.gz
chromium_src-70d2f990df7755c6e76aa20f156ff1f92a25f318.tar.bz2
Add cloud_print to the GN build.
There were some existing cloud_print targets that were hooked up only on Linux, but most of the code was Windows-only. This adds the missing targets and should bring us up to GYP parity. Fix the cloud print size_t to int warnings and remove the warning disable from GYP. Move generated resources file from cloud_print/resources.h to cloud_print/service/resources.h to match where the source file is. Cloud print does some messy things to get the content switches constants, including the file directly in its sources and manually setting LINK_CONTENT_STATICALLY for all targets. In GN, this adds a static_switches target in content that does this in an official way. Reland of https://codereview.chromium.org/1393123003/ with warning fixes TBR=dpranke Review URL: https://codereview.chromium.org/1397433004 Cr-Commit-Position: refs/heads/master@{#354089}
Diffstat (limited to 'build/win')
-rw-r--r--build/win/require_administrator.manifest9
1 files changed, 9 insertions, 0 deletions
diff --git a/build/win/require_administrator.manifest b/build/win/require_administrator.manifest
new file mode 100644
index 0000000..4142e73
--- /dev/null
+++ b/build/win/require_administrator.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
+ </requestedPrivileges>
+ </security>
+</trustInfo></assembly>