diff options
| author | thakis <thakis@chromium.org> | 2015-10-13 18:23:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-14 01:24:31 +0000 |
| commit | 515fe9b0261a76412f696062c0c70440db743118 (patch) | |
| tree | 5c6a6526ab05e3a6990da09b0b31c7924570b7a7 /build | |
| parent | 79e506a61a58a10da7e826e4acba6f7fe4e94845 (diff) | |
| download | chromium_src-515fe9b0261a76412f696062c0c70440db743118.zip chromium_src-515fe9b0261a76412f696062c0c70440db743118.tar.gz chromium_src-515fe9b0261a76412f696062c0c70440db743118.tar.bz2 | |
Revert of Add cloud_print to the GN build. (patchset #5 id:80001 of https://codereview.chromium.org/1393123003/ )
Reason for revert:
Broke http://build.chromium.org/p/chromium.win/builders/Win%20x64%20Builder%20%28dbg%29/builds/14017
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.
>
> Committed: https://crrev.com/53eae14bacb401632d4f2045ed8715705dcd8d1d
> Cr-Commit-Position: refs/heads/master@{#353928}
TBR=dpranke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1407623003
Cr-Commit-Position: refs/heads/master@{#353938}
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/win/manifest.gni | 4 | ||||
| -rw-r--r-- | build/gn_migration.gypi | 10 | ||||
| -rw-r--r-- | build/win/require_administrator.manifest | 9 |
3 files changed, 5 insertions, 18 deletions
diff --git a/build/config/win/manifest.gni b/build/config/win/manifest.gni index 285cf25..6dc6755 100644 --- a/build/config/win/manifest.gni +++ b/build/config/win/manifest.gni @@ -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: diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 0d5a7a5..1c97307 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -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', diff --git a/build/win/require_administrator.manifest b/build/win/require_administrator.manifest deleted file mode 100644 index 4142e73..0000000 --- a/build/win/require_administrator.manifest +++ /dev/null @@ -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> |