summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authoreroman <eroman@chromium.org>2015-02-27 15:41:24 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-27 23:41:58 +0000
commitd593eac9968cee2b5412ba22638ed16f0884c408 (patch)
tree4b9141e61f879d7e7b226a6d250c72de847e65d6 /remoting/protocol
parent77b5872e9a7181afcc3b59881af5218a0d42ea7b (diff)
downloadchromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.zip
chromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.tar.gz
chromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.tar.bz2
Revert of Add remoting and PPAPI tests to GN build (patchset #7 id:120001 of https://codereview.chromium.org/965633002/)
Reason for revert: http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%20GN&number=4498 ERROR at //remoting/host/BUILD.gn:56:7: Item not found "linux/x_server_clipboard.cc", ^---------------------------- You were trying to remove "linux/x_server_clipboard.cc" Original issue's description: > Add remoting and PPAPI tests to GN build > > BUG= > > Committed: https://crrev.com/d0437210926b14b1b7e06b2b56174fc92ade9c37 > Cr-Commit-Position: refs/heads/master@{#318539} TBR=kelvinp@chromium.org,dpranke@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/970443002 Cr-Commit-Position: refs/heads/master@{#318545}
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/BUILD.gn75
1 files changed, 7 insertions, 68 deletions
diff --git a/remoting/protocol/BUILD.gn b/remoting/protocol/BUILD.gn
index a442695..34b38af 100644
--- a/remoting/protocol/BUILD.gn
+++ b/remoting/protocol/BUILD.gn
@@ -2,12 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//remoting/remoting_srcs.gni")
+static_library("protocol") {
+ gypi_values = exec_script("//build/gypi_to_gn.py",
+ [ rebase_path("../remoting_srcs.gypi") ],
+ "scope",
+ [ "../remoting_srcs.gypi" ])
-source_set("protocol") {
- sources = rebase_path(remoting_srcs_gypi_values.remoting_protocol_sources,
- ".",
- "//remoting")
+ sources =
+ rebase_path(gypi_values.remoting_protocol_sources, ".", "//remoting")
configs += [
"//build/config/compiler:no_size_t_to_int_warning",
@@ -15,7 +17,6 @@ source_set("protocol") {
]
public_deps = [
- "//remoting/proto",
"//third_party/libjingle",
]
deps = [
@@ -25,67 +26,5 @@ source_set("protocol") {
"//jingle:notifier",
"//net",
"//remoting/base",
- "//remoting/codec",
- ]
-}
-
-source_set("test_support") {
- testonly = true
-
- sources = [
- "fake_authenticator.cc",
- "fake_authenticator.h",
- "fake_datagram_socket.cc",
- "fake_datagram_socket.h",
- "fake_session.cc",
- "fake_session.h",
- "fake_stream_socket.cc",
- "fake_stream_socket.h",
- "protocol_mock_objects.cc",
- "protocol_mock_objects.h",
- ]
-
- public_deps = [
- ":protocol",
- "//testing/gmock",
- ]
-}
-
-source_set("unit_tests") {
- testonly = true
-
- sources = [
- "authenticator_test_base.cc",
- "authenticator_test_base.h",
- "channel_multiplexer_unittest.cc",
- "chromium_socket_factory_unittest.cc",
- "client_video_dispatcher_unittest.cc",
- "clipboard_echo_filter_unittest.cc",
- "clipboard_filter_unittest.cc",
- "connection_tester.cc",
- "connection_tester.h",
- "connection_to_client_unittest.cc",
- "content_description_unittest.cc",
- "input_event_tracker_unittest.cc",
- "input_filter_unittest.cc",
- "jingle_messages_unittest.cc",
- "jingle_session_unittest.cc",
- "message_decoder_unittest.cc",
- "message_reader_unittest.cc",
- "monitored_video_stub_unittest.cc",
- "mouse_input_filter_unittest.cc",
- "negotiating_authenticator_unittest.cc",
- "network_settings_unittest.cc",
- "pairing_registry_unittest.cc",
- "ppapi_module_stub.cc",
- "ssl_hmac_channel_authenticator_unittest.cc",
- "third_party_authenticator_unittest.cc",
- "v2_authenticator_unittest.cc",
- ]
-
- deps = [
- ":test_support",
- "//testing/gmock",
- "//testing/gtest",
]
}