summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-10-13 17:49:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-14 00:50:16 +0000
commit53eae14bacb401632d4f2045ed8715705dcd8d1d (patch)
tree9e081d4dc9e2ac8570c7e120ad8812fe30a52b53 /build
parent0b999094d4ce8a462b70327cc38ca117313a1504 (diff)
downloadchromium_src-53eae14bacb401632d4f2045ed8715705dcd8d1d.zip
chromium_src-53eae14bacb401632d4f2045ed8715705dcd8d1d.tar.gz
chromium_src-53eae14bacb401632d4f2045ed8715705dcd8d1d.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. Review URL: https://codereview.chromium.org/1393123003 Cr-Commit-Position: refs/heads/master@{#353928}
Diffstat (limited to 'build')
-rw-r--r--build/config/win/manifest.gni4
-rw-r--r--build/gn_migration.gypi10
-rw-r--r--build/win/require_administrator.manifest9
3 files changed, 18 insertions, 5 deletions
diff --git a/build/config/win/manifest.gni b/build/config/win/manifest.gni
index 6dc6755..285cf25 100644
--- a/build/config/win/manifest.gni
+++ b/build/config/win/manifest.gni
@@ -42,6 +42,10 @@ common_controls_manifest = "//build/win/common_controls.manifest"
# request elevated privileges from the user. This is normally what you want.
as_invoker_manifest = "//build/win/as_invoker.manifest"
+# An alternative to as_invoker_manifest when you want the application to always
+# elevate.
+require_administrator_manifest = "//build/win/require_administrator.manifest"
+
# Construct a target to combine the given manifest files into a .rc file.
#
# Variables for the windows_manifest template:
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 1c97307..0d5a7a5 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -477,6 +477,11 @@
'../chrome/installer/mini_installer.gyp:mini_installer',
'../chrome_elf/chrome_elf.gyp:chrome_elf_unittests',
'../chrome_elf/chrome_elf.gyp:dll_hash_main',
+ '../cloud_print/service/win/service.gyp:cloud_print_service',
+ '../cloud_print/service/win/service.gyp:cloud_print_service_config',
+ '../cloud_print/service/win/service.gyp:cloud_print_service_setup',
+ '../cloud_print/virtual_driver/win/install/virtual_driver_install.gyp:virtual_driver_setup',
+ '../cloud_print/virtual_driver/win/virtual_driver.gyp:gcp_portmon',
'../components/components.gyp:wifi_test',
'../net/net.gyp:quic_client',
'../net/net.gyp:quic_server',
@@ -673,11 +678,6 @@
'../cloud_print/gcp20/prototype/gcp20_device.gyp:gcp20_device',
'../cloud_print/gcp20/prototype/gcp20_device.gyp:gcp20_device_unittests',
- '../cloud_print/service/win/service.gyp:cloud_print_service',
- '../cloud_print/service/win/service.gyp:cloud_print_service_config',
- '../cloud_print/service/win/service.gyp:cloud_print_service_setup',
- '../cloud_print/virtual_driver/win/install/virtual_driver_install.gyp:virtual_driver_setup',
- '../cloud_print/virtual_driver/win/virtual_driver.gyp:gcp_portmon',
'../components/test_runner/test_runner.gyp:layout_test_helper',
'../content/content_shell_and_tests.gyp:content_shell_crash_service',
'../gpu/gpu.gyp:angle_end2end_tests',
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>