Fixing gn manifests for many executables

remoting/host/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
+import("//build/config/win/manifest.gni")
 import("//build/util/version.gni")
 import("//remoting/remoting_enable.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_options.gni")
 import("//remoting/remoting_srcs.gni")
 import("//remoting/remoting_version.gni")
 import("//remoting/tools/build/remoting_localize.gni")
 
+# Reference this manifest to indicate that a process is per-monitor DPI aware.
+dpi_aware_manifest = "//remoting/host/win/dpi_aware.manifest"
+
+# Depending on this target gives a default executable manifest with the addition
+# of the DPI aware tag.
+windows_manifest("dpi_aware_exe_manifest") {
+  sources = [
+    as_invoker_manifest,
+    common_controls_manifest,
+    default_compatibility_manifest,
+    dpi_aware_manifest,
+  ]
+  type = "exe"
+}
+
+# Depending on this target gives a default executable manifest with the addition
+# of the DPI aware tag and a requestedExecutionLevel of requireAdministrator.
+windows_manifest("dpi_aware_elevated_exe_manifest") {
+  sources = [
+    common_controls_manifest,
+    default_compatibility_manifest,
+    dpi_aware_manifest,
+    require_administrator_manifest,
+  ]
+  type = "exe"
+}
+
 # GYP version: remoting/remoting_host:remoting_host_credits
 action("credits") {
   # We put this in $root_build_dir/gen/remoting instead of
   # $root_build_dir/gen/remoting/host (target_gen_dir) for
   # compatibility w/ GYP, since the installer needs the file to
   # be at the same location.
   about_credits_file = "$root_build_dir/gen/remoting/CREDITS.txt"
   script = "//tools/licenses.py"
 
   inputs = [
@@ skipping 425 matching lines @@
       ]
     }
 
     # GYP version: remoting/remoting_host_win.gypi:remoting_console
     executable("remoting_console") {
       configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
       defines = [ "BINARY=BINARY_HOST_ME2ME" ]
 
       deps = [
+        ":dpi_aware_exe_manifest",
         ":remoting_core",
         ":remoting_windows_resources",
       ]
 
       sources = [
         "$root_gen_dir/remoting/version.rc",
         "win/entry_point.cc",
       ]
 
       ldflags = [
-        "/MANIFEST:EMBED",
-        "/MANIFESTINPUT:" +
-            rebase_path("win/dpi_aware.manifest", root_build_dir),
         "/ENTRY:HostEntryPoint",
-
         # "/NODEFAULTLIB",
       ]
     }
 
     # GYP version: //remoting/remoting_host_win.gypi:remoting_core
     shared_library("remoting_core") {
       configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
       defines = [
         "_ATL_APARTMENT_THREADED",
@@ skipping 24 matching lines @@
 
       deps = [
         ":remoting_lib_idl",
         ":remoting_lib_ps",
         ":remoting_me2me_host_static",
         ":remoting_windows_resources",
         "//base",
         "//base:base_static",
         "//base/allocator",
         "//base/third_party/dynamic_annotations",
+        "//build/win:default_exe_manifest",
         "//ipc",
         "//net",
         "//remoting/base",
         "//remoting/base:breakpad",
         "//remoting/codec",
         "//remoting/host",
         "//remoting/host:messages",
         "//remoting/host/it2me:common",
         "//remoting/host/native_messaging",
         "//remoting/host/setup",
@@ skipping 24 matching lines @@
         "win/rdp_desktop_session.cc",
         "win/rdp_desktop_session.h",
         "win/unprivileged_process_delegate.cc",
         "win/unprivileged_process_delegate.h",
         "win/wts_session_process_delegate.cc",
         "win/wts_session_process_delegate.h",
         "worker_process_ipc_delegate.h",
       ]
 
       ldflags = [
-        "/MANIFEST:EMBED",
-        "/MANIFESTINPUT:" +
-            rebase_path("win/common-controls.manifest", root_build_dir),
         "/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE",
         "/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE",
         "/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE",
         "/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE",
       ]
 
       libs = [
         "comctl32.lib",
         "rpcns4.lib",
         "rpcrt4.lib",
@@ skipping 13 matching lines @@
         "//build/config/win:windowed",
       ]
 
       defines = [ "BINARY=BINARY_DESKTOP" ]
 
       deps = [
         ":remoting_core",
         ":remoting_windows_resources",
       ]
 
+      if (is_official_build) {
+        deps += [ ":dpi_aware_elevated_exe_manifest" ]
+      } else {
+        deps += [ ":dpi_aware_exe_manifest" ]
+      }
+
       sources = [
         "$root_gen_dir/remoting/version.rc",
         "win/entry_point.cc",
       ]
 
       ldflags = [
-        "/MANIFEST:EMBED",
-        "/MANIFESTINPUT:" +
-            rebase_path("win/dpi_aware.manifest", root_build_dir),
         "/ENTRY:HostEntryPoint",
-
         # "/NODEFAULTLIB",
       ]
-
-      if (is_official_build) {
-        ldflags +=
-            [ "/MANIFESTUAC:level='requiresAdministrator' uiAccess='true'" ]
-      } else {
-        ldflags += [ "/MANIFESTUAC" ]
-      }
     }
 
     # GYP version: //remoting/remoting_host_win.gypi:remote_security_key
     executable("remote_security_key") {
       configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
       defines = [ "BINARY=BINARY_REMOTE_SECURITY_KEY" ]
 
       deps = [
         ":remoting_core",
@@ skipping 171 matching lines @@
       # GYP version: //remoting/remoting_host_win.gypi:remoting_me2me_host
       executable("remoting_me2me_host") {
         configs += [
           "//build/config/compiler:wexit_time_destructors",
           "//build/config/win:windowed",
         ]
 
         defines = [ "BINARY=BINARY_HOST_ME2ME" ]
 
         deps = [
+          ":dpi_aware_exe_manifest",
           ":remoting_core",
           ":remoting_windows_resources",
         ]
 
         sources = [
           "$root_gen_dir/remoting/version.rc",
           "win/entry_point.cc",
         ]
 
         output_name = "remoting_host"
 
         ldflags = [
-          "/MANIFEST:EMBED",
-          "/MANIFESTINPUT:" +
-              rebase_path("win/dpi_aware.manifest", root_build_dir),
           "/ENTRY:HostEntryPoint",
-
           # "/NODEFAULTLIB",
         ]
       }
     } else {
       executable("remoting_me2me_host") {
         configs += [ "//remoting:version" ]
 
         sources = [
           "host_main.cc",
           "host_main.h",
@@ skipping 283 matching lines @@
           "--target_arch",
           "$target_cpu",
           rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
                       root_build_dir),
           rebase_path(outputs[0], root_build_dir),
         ]
       }
     }
   }
 }