Revert of Add cloud_print to the GN build. (patchset #1 id:1 of https://codereview.chromium.org/1397433004/ )

Reason for revert:
Causes compile failures:
http://build.chromium.org/p/chromium/builders/Win/builds/36509/steps/compile/logs/stdio

ninja:error: 'gen/cloud_print/service_resources_en.rc', needed by 'obj/cloud_print/service/win/gen/cloud_print/cloud_print_service.service_resources_en.res', missing and no known rule to make it

Original issue's description:
> 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
>
> Committed: https://crrev.com/70d2f990df7755c6e76aa20f156ff1f92a25f318
> Cr-Commit-Position: refs/heads/master@{#354089}

TBR=dpranke@google.com,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

Cr-Original-Commit-Position: refs/heads/master@{#354098}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 297953be4033da6b26b9d084350b96c326aacefb
This commit is contained in:
mpearson 2015-10-14 13:25:00 -07:00 коммит произвёл Commit bot
Родитель 70518b2b24
Коммит 236b5d9e90
3 изменённых файлов: 5 добавлений и 18 удалений

Просмотреть файл

@ -42,10 +42,6 @@ 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:

Просмотреть файл

@ -477,11 +477,6 @@
'../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',
@ -678,6 +673,11 @@
'../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',

Просмотреть файл

@ -1,9 +0,0 @@
<?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>