diff options
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/android/client_java_tmpl.gni | 7 | ||||
-rw-r--r-- | chromium/remoting/android/remoting_apk_tmpl.gni | 2 | ||||
-rw-r--r-- | chromium/remoting/base/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/base/grpc_support/BUILD.gn | 69 | ||||
-rw-r--r-- | chromium/remoting/host/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/host/win/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/protocol/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/signaling/BUILD.gn | 53 | ||||
-rw-r--r-- | chromium/remoting/test/BUILD.gn | 36 |
9 files changed, 143 insertions, 34 deletions
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni index 33f82da89e2..7c37778d56c 100644 --- a/chromium/remoting/android/client_java_tmpl.gni +++ b/chromium/remoting/android/client_java_tmpl.gni @@ -37,6 +37,7 @@ template("remoting_android_client_java_tmpl") { "NavigationMenuAdapter.java", "OAuthTokenConsumer.java", "Preconditions.java", + "PrivacyPolicyActivity.java", "RenderData.java", "RenderStub.java", "ScaleEventParameter.java", @@ -47,6 +48,7 @@ template("remoting_android_client_java_tmpl") { "SwipePinchDetector.java", "SystemUiVisibilityChangedEventParameter.java", "TapGestureDetector.java", + "TermsOfServiceActivity.java", "ThirdPartyTokenFetcher.java", "TouchEventParameter.java", "TouchInputHandler.java", @@ -54,6 +56,7 @@ template("remoting_android_client_java_tmpl") { "TrackpadInputStrategy.java", "TapEventParameter.java", "TwoPointsEventParameter.java", + "WebViewActivity.java", "accountswitcher/AccountManagerCompat.java", "accountswitcher/AccountSwitcher.java", "accountswitcher/AccountSwitcherBase.java", @@ -82,9 +85,9 @@ template("remoting_android_client_java_tmpl") { "//remoting/android:remoting_android_client_java_resources", "//remoting/android:remoting_apk_manifest", "//third_party/android_deps:android_arch_lifecycle_common_java", - "//third_party/android_deps:android_support_annotations_java", "//third_party/android_deps:android_support_v7_appcompat_java", - "//third_party/android_deps:android_support_v7_mediarouter_java", + "//third_party/android_deps:com_android_support_mediarouter_v7_java", + "//third_party/android_deps:com_android_support_support_annotations_java", "//ui/android:ui_utils_java", ] diff --git a/chromium/remoting/android/remoting_apk_tmpl.gni b/chromium/remoting/android/remoting_apk_tmpl.gni index 9ad8d0ed8b4..7519a76918b 100644 --- a/chromium/remoting/android/remoting_apk_tmpl.gni +++ b/chromium/remoting/android/remoting_apk_tmpl.gni @@ -9,6 +9,8 @@ template("remoting_apk_tmpl") { android_apk(target_name) { forward_variables_from(invoker, "*") + enable_multidex = false + android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml" android_manifest_dep = "//remoting/android:remoting_apk_manifest" shared_libraries = [ "//remoting/client/jni:remoting_client_jni" ] diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn index e362c453269..16a71c56bdc 100644 --- a/chromium/remoting/base/BUILD.gn +++ b/chromium/remoting/base/BUILD.gn @@ -91,8 +91,6 @@ source_set("authorization") { "gaia_oauth_client.cc", "gaia_oauth_client.h", "oauth_client.h", - "oauth_helper.cc", - "oauth_helper.h", "oauth_token_getter.cc", "oauth_token_getter.h", "oauth_token_getter_impl.cc", @@ -167,7 +165,6 @@ source_set("unit_tests") { "buffered_socket_writer_unittest.cc", "capabilities_unittest.cc", "compound_buffer_unittest.cc", - "oauth_helper_unittest.cc", "rate_counter_unittest.cc", "result_unittest.cc", "rsa_key_pair_unittest.cc", diff --git a/chromium/remoting/base/grpc_support/BUILD.gn b/chromium/remoting/base/grpc_support/BUILD.gn new file mode 100644 index 00000000000..b71884ee7a3 --- /dev/null +++ b/chromium/remoting/base/grpc_support/BUILD.gn @@ -0,0 +1,69 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/grpc/grpc_library.gni") + +static_library("grpc_support") { + sources = [ + "grpc_async_executor.cc", + "grpc_async_executor.h", + "grpc_async_request.cc", + "grpc_async_request.h", + "grpc_async_server_streaming_request.cc", + "grpc_async_server_streaming_request.h", + "grpc_async_unary_request.h", + "grpc_authenticated_executor.cc", + "grpc_authenticated_executor.h", + "grpc_channel.cc", + "grpc_channel.h", + "grpc_executor.h", + "root_certs_prod.inc", + "scoped_grpc_server_stream.cc", + "scoped_grpc_server_stream.h", + "using_grpc_channel_shared_ptr.inc", + ] + + deps = [ + "//base", + "//third_party/grpc:grpcpp", + ] +} + +cc_grpc_library("unit_tests_grpc_library") { + sources = [ + "grpc_support_test_services.proto", + ] +} + +source_set("test_support") { + testonly = true + + sources = [ + "grpc_async_test_server.cc", + "grpc_async_test_server.h", + "grpc_test_util.cc", + "grpc_test_util.h", + ] + + deps = [ + "//base", + "//third_party/grpc:grpcpp", + ] +} + +source_set("unit_tests") { + testonly = true + + sources = [ + "grpc_async_executor_unittest.cc", + "grpc_authenticated_executor_unittest.cc", + ] + deps = [ + ":grpc_support", + ":test_support", + ":unit_tests_grpc_library", + "//testing/gmock", + "//testing/gtest", + ] +} diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index 7aeefa7b1b8..229a7cb37e3 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -155,6 +155,8 @@ static_library("common") { "evaluate_capability.h", "forward_process_stats_agent.cc", "forward_process_stats_agent.h", + "ftl_signaling_connector.cc", + "ftl_signaling_connector.h", "gcd_rest_client.cc", "gcd_rest_client.h", "gcd_state_updater.cc", @@ -381,6 +383,7 @@ static_library("common") { deps += [ "//ash", "//remoting/host/chromeos", + "//ui/base/ime/chromeos", ] if (use_ozone) { diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn index 3c9d1988008..1354dab3aa1 100644 --- a/chromium/remoting/host/win/BUILD.gn +++ b/chromium/remoting/host/win/BUILD.gn @@ -290,6 +290,7 @@ executable("remoting_console") { ] if (!is_asan) { + no_default_deps = true ldflags = [ "/ENTRY:HostEntryPoint", # "/NODEFAULTLIB", @@ -320,6 +321,7 @@ executable("remoting_me2me_host") { output_name = "remoting_host" if (!is_asan) { + no_default_deps = true ldflags = [ "/ENTRY:HostEntryPoint", # "/NODEFAULTLIB", @@ -466,6 +468,7 @@ executable("remoting_desktop") { ] if (!is_asan) { + no_default_deps = true ldflags = [ "/ENTRY:HostEntryPoint", # "/NODEFAULTLIB", diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn index 18e653fa461..2e9e7892cda 100644 --- a/chromium/remoting/protocol/BUILD.gn +++ b/chromium/remoting/protocol/BUILD.gn @@ -207,6 +207,7 @@ static_library("protocol") { "//remoting/signaling", "//third_party/boringssl", "//third_party/libyuv", + "//ui/events:dom_keycode_converter", ] defines = [] diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn index 82491176d71..d3d31505123 100644 --- a/chromium/remoting/signaling/BUILD.gn +++ b/chromium/remoting/signaling/BUILD.gn @@ -8,20 +8,29 @@ static_library("signaling") { sources = [ "delegating_signal_strategy.cc", "delegating_signal_strategy.h", - "ftl_client.cc", - "ftl_client.h", - "grpc_async_call_data.cc", - "grpc_async_call_data.h", - "grpc_async_dispatcher.cc", - "grpc_async_dispatcher.h", + "ftl_device_id_provider.h", + "ftl_grpc_context.cc", + "ftl_grpc_context.h", + "ftl_host_device_id_provider.cc", + "ftl_host_device_id_provider.h", + "ftl_message_reception_channel.cc", + "ftl_message_reception_channel.h", + "ftl_messaging_client.cc", + "ftl_messaging_client.h", + "ftl_registration_manager.cc", + "ftl_registration_manager.h", + "ftl_signal_strategy.cc", + "ftl_signal_strategy.h", "iq_sender.cc", "iq_sender.h", "jid_util.cc", "jid_util.h", "log_to_server.cc", "log_to_server.h", + "message_reception_channel.h", "push_notification_subscriber.cc", "push_notification_subscriber.h", + "registration_manager.h", "server_log_entry.cc", "server_log_entry.h", "signal_strategy.h", @@ -55,23 +64,31 @@ static_library("signaling") { "//jingle:jingle_glue", "//net", "//remoting/base", + "//remoting/base/grpc_support", "//third_party/grpc:grpcpp", ] if (is_nacl) { sources -= [ - "ftl_client.cc", - "ftl_client.h", - "grpc_async_call_data.cc", - "grpc_async_call_data.h", - "grpc_async_dispatcher.cc", - "grpc_async_dispatcher.h", + "ftl_grpc_context.cc", + "ftl_grpc_context.h", + "ftl_host_device_id_provider.cc", + "ftl_host_device_id_provider.h", + "ftl_message_reception_channel.cc", + "ftl_message_reception_channel.h", + "ftl_messaging_client.cc", + "ftl_messaging_client.h", + "ftl_registration_manager.cc", + "ftl_registration_manager.h", + "ftl_signal_strategy.cc", + "ftl_signal_strategy.h", "log_to_server.cc", "server_log_entry.cc", "xmpp_signal_strategy.cc", ] deps -= [ "//google_apis", + "//remoting/base/grpc_support", "//third_party/grpc:grpcpp", ] public_deps -= [ ":ftl_grpc_library" ] @@ -80,6 +97,7 @@ static_library("signaling") { cc_grpc_library("ftl_grpc_library") { sources = [ + "chromoting_message.proto", "ftl.proto", "ftl_services.proto", ] @@ -105,7 +123,8 @@ source_set("unit_tests") { testonly = true sources = [ - "grpc_async_dispatcher_unittest.cc", + "ftl_message_reception_channel_unittest.cc", + "ftl_messaging_client_unittest.cc", "iq_sender_unittest.cc", "jid_util_unittest.cc", "log_to_server_unittest.cc", @@ -120,15 +139,9 @@ source_set("unit_tests") { deps = [ ":test_support", - ":unit_tests_grpc_library", "//net:test_support", + "//remoting/base/grpc_support:unit_tests", "//testing/gmock", "//testing/gtest", ] } - -cc_grpc_library("unit_tests_grpc_library") { - sources = [ - "grpc_async_dispatcher_test_services.proto", - ] -} diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn index d916fa822a8..57b7f3b4e50 100644 --- a/chromium/remoting/test/BUILD.gn +++ b/chromium/remoting/test/BUILD.gn @@ -12,6 +12,8 @@ static_library("test_support") { "access_token_fetcher.h", "chromoting_test_driver_environment.cc", "chromoting_test_driver_environment.h", + "cli_util.cc", + "cli_util.h", "connection_setup_info.cc", "connection_setup_info.h", "connection_time_observer.cc", @@ -49,6 +51,10 @@ static_library("test_support") { "scroll_frame_generator.h", "test_chromoting_client.cc", "test_chromoting_client.h", + "test_device_id_provider.cc", + "test_device_id_provider.h", + "test_oauth_token_getter.cc", + "test_oauth_token_getter.h", "test_token_storage.cc", "test_token_storage.h", "test_video_renderer.cc", @@ -75,6 +81,10 @@ static_library("test_support") { deps = [ "//google_apis", + "//remoting/base:authorization", + "//remoting/base:test_support", + "//services/network:network_service", + "//services/network/public/mojom", "//skia", "//testing/gmock", "//testing/gtest", @@ -176,6 +186,22 @@ if (enable_remoting_host && !is_android && !is_chromeos) { } } +# A binary for testing and fiddling FTL services. +executable("ftl_services_playground") { + testonly = true + sources = [ + "ftl_services_playground.cc", + "ftl_services_playground.h", + "ftl_services_playground_main.cc", + ] + deps = [ + ":test_support", + "//mojo/core/embedder", + "//remoting/base", + "//remoting/signaling", + ] +} + # A binary for testing and fiddling the FTL signaling process. executable("ftl_signaling_playground") { testonly = true @@ -183,20 +209,12 @@ executable("ftl_signaling_playground") { "ftl_signaling_playground.cc", "ftl_signaling_playground.h", "ftl_signaling_playground_main.cc", - "test_oauth_token_factory.cc", - "test_oauth_token_factory.h", - "test_token_storage.cc", - "test_token_storage.h", ] deps = [ - "//google_apis", + ":test_support", "//mojo/core/embedder", "//remoting/base", - "//remoting/base:authorization", - "//remoting/base:test_support", "//remoting/signaling", - "//services/network:network_service", - "//services/network/public/mojom", ] } |