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

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

Issue 1778313003: Revert of Move //remoting/remoting_host_win.gypi:* to GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/BUILD.gn ('k') | remoting/host/win/chromoting_lib.rc » ('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 6909a350edfb96193dc27f1e364a0b1df0a914b1..a584c7218fa1d1e80188544c19fc2d58f0d37a98 100644
--- a/remoting/host/it2me/BUILD.gn
+++ b/remoting/host/it2me/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
-import("//remoting/remoting_enable.gni")
+import("//remoting/remoting_host.gni")
import("//remoting/remoting_srcs.gni")
source_set("common") {
@@ -27,67 +27,34 @@
]
}
-if (!is_chromeos && enable_remoting_host) {
- if (is_win) {
- # GYP version:
- # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host
- executable("remote_assistance_host") {
- configs += [ "//build/config/compiler:wexit_time_destructors" ]
+if (!is_win && !is_chromeos && enable_remoting_host) {
+ executable("remote_assistance_host") {
+ sources = [
+ "it2me_native_messaging_host_entry_point.cc",
+ "it2me_native_messaging_host_main.cc",
+ "it2me_native_messaging_host_main.h",
+ ]
- deps = [
- "//base/allocator",
- "//remoting/host:remoting_core",
- "//remoting/host:remoting_windows_resources",
- ]
+ configs += [
+ "//build/config/compiler:wexit_time_destructors",
+ "//remoting:version",
+ ]
- sources = [
- "$root_gen_dir/remoting/version.rc",
- "it2me_native_messaging_host_entry_point.cc",
- ]
+ deps = [
+ ":common",
+ "//build/config/sanitizers:deps",
+ "//remoting/host",
+ "//remoting/host/native_messaging",
+ "//remoting/proto",
+ "//ui/gfx",
+ ]
- defines = [ "BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ]
+ if (enable_webrtc) {
+ deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+ }
- 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",
- ]
- }
- } else {
- executable("remote_assistance_host") {
- sources = [
- "it2me_native_messaging_host_entry_point.cc",
- "it2me_native_messaging_host_main.cc",
- "it2me_native_messaging_host_main.h",
- ]
-
- configs += [
- "//build/config/compiler:wexit_time_destructors",
- "//remoting:version",
- ]
-
- deps = [
- ":common",
- "//build/config/sanitizers:deps",
- "//remoting/host",
- "//remoting/host/native_messaging",
- "//remoting/proto",
- "//ui/gfx",
- ]
-
- if (enable_webrtc) {
- deps += [ "//third_party/libjingle:libjingle_webrtc" ]
- }
-
- if (is_desktop_linux) {
- deps += [ "//build/config/linux/gtk2" ]
- }
+ if (is_desktop_linux) {
+ deps += [ "//build/config/linux/gtk2" ]
}
}
}
« no previous file with comments | « remoting/host/BUILD.gn ('k') | remoting/host/win/chromoting_lib.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698