Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: remoting/host/it2me/BUILD.gn

Issue 2185693003: Adding an It2Me host binary which is uiaccess enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@elevated
Patch Set: Merging with Tot Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/installer/win/chromoting.wxs ('k') | remoting/host/predefines_win.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/it2me/BUILD.gn
diff --git a/remoting/host/it2me/BUILD.gn b/remoting/host/it2me/BUILD.gn
index 53e02a13a364dd21613a3e426f4d1ec705dd983e..05bd9eb45f602ef73428b7c64d284e3bbbfa94e4 100644
--- a/remoting/host/it2me/BUILD.gn
+++ b/remoting/host/it2me/BUILD.gn
@@ -53,6 +53,7 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
deps = [
"//base/allocator",
+ "//remoting/host:dpi_aware_exe_manifest",
"//remoting/host:remoting_core",
"//remoting/host:remoting_windows_resources",
]
@@ -65,16 +66,43 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
defines = host_predefines + [ "BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ]
ldflags = [
- "/MANIFEST:EMBED",
- "/MANIFESTINPUT:" +
- rebase_path("../win/common-controls.manifest", root_build_dir),
- "/MANIFESTINPUT:" +
- rebase_path("../win/dpi_aware.manifest", root_build_dir),
+ # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in
+ # GYP does not take effect?
+ "comctl32.lib",
+ ]
+ }
+
+ # GYP version:
+ # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host_uiaccess
+ executable("remote_assistance_host_uiaccess") {
+ configs += [ "//build/config/compiler:wexit_time_destructors" ]
+
+ deps = [
+ "//base/allocator",
+ "//remoting/host:remoting_core",
+ "//remoting/host:remoting_windows_resources",
+ ]
+
+ sources = [
+ "$root_gen_dir/remoting/version.rc",
+ "it2me_native_messaging_host_entry_point.cc",
+ ]
+
+ defines = host_predefines + [ "BINARY=BINARY_HOST_IT2ME_UIACCESS" ]
+ ldflags = [
# "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in
# GYP does not take effect?
"comctl32.lib",
]
+
+ # uiAccess requires a signed build to work correctly, so only enable the
+ # manifest flag when the binary will be properly signed.
+ if (is_official_build) {
Jamie 2016/08/26 00:29:47 Would it be better to only build this target for a
joedow 2016/08/26 18:28:52 My thought on this was that it is better to build
+ deps += [ "//remoting/host:dpi_aware_uiaccess_exe_manifest" ]
+ } else {
+ deps += [ "//remoting/host:dpi_aware_exe_manifest" ]
+ }
}
} else {
if (is_mac) {
« no previous file with comments | « remoting/host/installer/win/chromoting.wxs ('k') | remoting/host/predefines_win.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698