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

Unified Diff: remoting/protocol/BUILD.gn

Issue 1462063004: Move VideoFramePump to remoting/protocol (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/video_frame_pump_unittest.cc ('k') | remoting/protocol/capture_scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/BUILD.gn
diff --git a/remoting/protocol/BUILD.gn b/remoting/protocol/BUILD.gn
index 20c1e64b7112ca5495ff456cb6868c8fe42f43af..593580d0c4e83343a1cd424df4d6eac65a8b4faf 100644
--- a/remoting/protocol/BUILD.gn
+++ b/remoting/protocol/BUILD.gn
@@ -30,24 +30,23 @@ source_set("protocol") {
"//remoting/signaling",
]
- if (is_nacl) {
- sources -= [
- "chromium_port_allocator.cc",
- "chromium_port_allocator_factory.cc",
- "chromium_socket_factory.cc",
- ]
- }
+ if (!is_nacl) {
+ sources +=
+ rebase_path(remoting_srcs_gypi_values.remoting_protocol_nonnacl_sources,
+ ".",
+ "//remoting")
- if (!is_nacl && enable_webrtc) {
- deps += [
- # TODO(GYP): crbug.com/481633. We should probably not have to depend on
- # libjingle_webrtc; that should be pulled in automatically by
- # libpeerconnection instead.
- "//third_party/libjingle:libjingle_webrtc",
- "//third_party/libjingle:libpeerconnection",
- ]
- } else {
- sources -= [ "webrtc_transport.cc" ]
+ if (enable_webrtc) {
+ deps += [
+ # TODO(GYP): crbug.com/481633. We should probably not have to depend on
+ # libjingle_webrtc; that should be pulled in automatically by
+ # libpeerconnection instead.
+ "//third_party/libjingle:libjingle_webrtc",
+ "//third_party/libjingle:libpeerconnection",
+ ]
+ } else {
+ sources -= [ "webrtc_transport.cc" ]
+ }
}
}
@@ -61,6 +60,8 @@ source_set("test_support") {
"fake_connection_to_host.h",
"fake_datagram_socket.cc",
"fake_datagram_socket.h",
+ "fake_desktop_capturer.cc",
+ "fake_desktop_capturer.h",
"fake_session.cc",
"fake_session.h",
"fake_stream_socket.cc",
@@ -81,6 +82,7 @@ source_set("unit_tests") {
sources = [
"authenticator_test_base.cc",
"authenticator_test_base.h",
+ "capture_scheduler_unittest.cc",
"channel_multiplexer_unittest.cc",
"channel_socket_adapter_unittest.cc",
"chromium_socket_factory_unittest.cc",
@@ -108,6 +110,7 @@ source_set("unit_tests") {
"ssl_hmac_channel_authenticator_unittest.cc",
"third_party_authenticator_unittest.cc",
"v2_authenticator_unittest.cc",
+ "video_frame_pump_unittest.cc",
"webrtc_transport_unittest.cc",
]
« no previous file with comments | « remoting/host/video_frame_pump_unittest.cc ('k') | remoting/protocol/capture_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698