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

Unified Diff: remoting/BUILD.gn

Issue 2308813002: Moving CRD Windows targets to subdirectories. (Closed)
Patch Set: The exec needs to be called native_messaging_host for downstream installers to work. Created 4 years, 3 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 | « .gn ('k') | remoting/build/config/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/BUILD.gn
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index 3d94643ffbe58d16e785295e550b8e5c23801fc9..c4c88d19baa7fce7ffbac3d39d08f858f6b5b0f9 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn
@@ -21,8 +21,7 @@ group("remoting_all") {
if (is_win) {
deps += [
"//remoting:remoting_breakpad_tester",
- "//remoting/host:remoting_console",
- "//remoting/host:remoting_desktop",
+ "//remoting/host/win:all",
]
if (is_chrome_branded) {
@@ -55,13 +54,8 @@ group("remoting_all") {
}
}
- # The same target is called differently on Linux.
- # TODO(sergeyu): Rename it to remoting_native_messaging_host on all
- # platforms.
- if (is_win) {
+ if (is_win || (!is_chromeos && !is_android && !is_ios)) {
deps += [ "//remoting/host:remoting_native_messaging_host" ]
- } else if (!is_chromeos && !is_android) {
- deps += [ "//remoting/host:native_messaging_host" ]
}
if (is_linux && !is_chromeos) {
@@ -90,11 +84,20 @@ if (is_win) {
"//remoting/host",
]
+ libs = []
+
configs += [ "//build/config/compiler:wexit_time_destructors" ]
sources = [
"tools/breakpad_tester_win.cc",
]
+
+ if (is_win) {
+ libs += [
+ "rpcrt4.lib",
+ "wtsapi32.lib",
+ ]
+ }
}
}
@@ -183,6 +186,9 @@ test("remoting_unittests") {
if (enable_remoting_host) {
test("remoting_perftests") {
+ defines = []
+ libs = []
+
sources = [
"test/codec_perftest.cc",
"test/protocol_perftest.cc",
@@ -205,5 +211,14 @@ if (enable_remoting_host) {
if (enable_webrtc) {
deps += [ "//third_party/libjingle:libjingle_webrtc" ]
}
+
+ if (is_win) {
+ defines += [ "_ALT_NO_EXCEPTIONS" ]
+
+ libs += [
+ "rpcrt4.lib",
+ "wtsapi32.lib",
+ ]
+ }
}
}
« no previous file with comments | « .gn ('k') | remoting/build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698