diff options
Diffstat (limited to 'chromium/remoting')
| -rw-r--r-- | chromium/remoting/android/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/remoting/build/config/remoting_logging.gni | 14 | ||||
| -rw-r--r-- | chromium/remoting/host/BUILD.gn | 117 | ||||
| -rw-r--r-- | chromium/remoting/host/file_transfer/BUILD.gn | 8 | ||||
| -rw-r--r-- | chromium/remoting/host/input_monitor/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/remoting/host/it2me/BUILD.gn | 36 | ||||
| -rw-r--r-- | chromium/remoting/host/win/BUILD.gn | 24 | ||||
| -rw-r--r-- | chromium/remoting/protocol/BUILD.gn | 28 | ||||
| -rw-r--r-- | chromium/remoting/remoting_locales.gni | 71 | ||||
| -rw-r--r-- | chromium/remoting/resources/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/remoting/test/BUILD.gn | 20 | ||||
| -rw-r--r-- | chromium/remoting/tools/build/remoting_localize.gni | 6 |
12 files changed, 248 insertions, 84 deletions
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn index dfc46de055a..80977f36728 100644 --- a/chromium/remoting/android/BUILD.gn +++ b/chromium/remoting/android/BUILD.gn @@ -34,7 +34,7 @@ remoting_credits("credits_resources_raw") { remoting_localize("remoting_apk_manifest") { sources = [ "java/AndroidManifest.xml.jinja2" ] - locales = [ "en" ] + locale_list = [ "en" ] variables = [ rebase_path(branding_path) ] output = "$root_gen_dir/remoting/android/{{source_name_part}}" } @@ -160,7 +160,7 @@ remoting_apk_tmpl("remoting_apk") { remoting_localize("remoting_test_apk_manifest") { sources = [ "javatests/AndroidManifest.xml.jinja2" ] - locales = [ "en" ] + locale_list = [ "en" ] variables = [ rebase_path(branding_path) ] output = "$root_gen_dir/remoting/android_test/{{source_name_part}}" } diff --git a/chromium/remoting/build/config/remoting_logging.gni b/chromium/remoting/build/config/remoting_logging.gni new file mode 100644 index 00000000000..2e7e949f7a5 --- /dev/null +++ b/chromium/remoting/build/config/remoting_logging.gni @@ -0,0 +1,14 @@ +# Copyright 2021 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. + +declare_args() { + # Enabling this will cause WebRTC's LS_INFO and LS_VERBOSE (level 1) + # messages to appear in the debug log output. Note that WebRTC's + # "VERBOSE1" messages are very spammy and it is impossible to + # separately filter LS_INFO and LS_VERBOSE messages (see + # third_party/webrtc_overrides/rtc_base/). So a separate GN option is + # provided here, to allow this logging to be quickly enabled for Debug + # or Release builds. + remoting_webrtc_verbose_logging = false +} diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index ef3c4674848..b986097e7e6 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -6,6 +6,7 @@ import("//build/config/chromeos/ui_mode.gni") import("//build/config/python.gni") import("//build/util/process_version.gni") import("//remoting/build/config/remoting_build.gni") +import("//remoting/build/config/remoting_logging.gni") group("all_tests") { testonly = true @@ -25,7 +26,7 @@ group("all") { deps += [ ":remoting_host_branded" ] } - if (!is_chromeos_ash && !is_android && !is_ios) { + if (!is_chromeos_ash && !is_chromeos_lacros && !is_android && !is_ios) { deps += [ "//remoting/host:remoting_native_messaging_host", "//remoting/host:remoting_native_messaging_manifests", @@ -46,19 +47,10 @@ source_set("host") { deps = [ "//remoting/host/file_transfer" ] } -source_set("base") { +source_set("logging") { sources = [ - "host_exit_codes.cc", - "host_exit_codes.h", + "logging.cc", "logging.h", - "switches.cc", - "switches.h", - "username.cc", - "username.h", - ] - deps = [ - "//base", - "//remoting/base", ] if (is_linux || is_chromeos) { @@ -72,13 +64,39 @@ source_set("base") { if (is_win) { sources += [ "logging_win.cc" ] } + + if (remoting_webrtc_verbose_logging) { + defines = [ "WEBRTC_VERBOSE_LOGGING" ] + } + + deps = [ "//base" ] +} + +source_set("base") { + sources = [ + "host_exit_codes.cc", + "host_exit_codes.h", + "switches.cc", + "switches.h", + "username.cc", + "username.h", + ] + deps = [ + ":logging", + "//base", + "//remoting/base", + ] + public_deps = [ ":logging" ] } # Split up from common to avoid circular dependency. source_set("client_session_control") { sources = [ "client_session_control.h" ] - deps = [ "//remoting/protocol" ] + deps = [ + "//remoting/protocol", + "//ui/events:events", + ] } source_set("clipboard") { @@ -87,6 +105,7 @@ source_set("clipboard") { deps = [ ":base", "//base", + "//remoting/base:base", "//remoting/proto", "//remoting/protocol", ] @@ -312,17 +331,23 @@ static_library("common") { "//components/policy/core/common", "//crypto", "//google_apis", + "//jingle:webrtc_glue", "//media", "//remoting/base", "//remoting/base:authorization", "//remoting/host/file_transfer:common", "//remoting/host/input_monitor", "//remoting/host/security_key", + "//remoting/proto/ftl/v1:ftl_messages", "//remoting/proto/remoting/v1:remote_support_host_messages", "//remoting/protocol", "//remoting/resources", + "//remoting/signaling:signaling", "//services/network:network_service", + "//services/network/public/cpp:cpp", + "//third_party/libjingle_xmpp", "//third_party/webrtc_overrides:webrtc_component", + "//ui/events:events", # //remoting uses the power_save_blocker directly. See crbug.com/689423 "//services/device/wake_lock/power_save_blocker", @@ -466,9 +491,11 @@ static_library("common") { ] deps += [ + ":base", ":remoting_version", "//remoting/host/mac:constants", "//remoting/host/mac:permission_checking", + "//ui/events:events", ] } @@ -493,12 +520,29 @@ static_library("common") { "touch_injector_win.cc", "touch_injector_win.h", "usage_stats_consent_win.cc", + + # TODO(crbug.com/1184893): These are in //remoting/host/win:remoting_core, but we can't add a + # dep for it because it would make a circular dependency. These should be + # moved to a new build target that both can depend on if possible. + "host_main.h", + "win/core_resource.h", + "win/etw_trace_consumer.h", + "win/host_event_file_logger.h", + "win/host_event_logger.h", + "win/host_event_windows_event_logger.h", + "win/host_service.h", + "win/unprivileged_process_delegate.h", + "win/wts_session_process_delegate.h", + "worker_process_ipc_delegate.h", ] libs += [ "crypt32.lib" ] deps += [ # On Windows, we use //media/gpu/MediaFoundationVideoEncodeAcceleratorWin # to detect whether HW encoder is supported by the system. "//media", + "//media/base/win:media_foundation_util", + "//media/gpu:gpu", + "//mojo/core/embedder:embedder", "//remoting/host/win", "//remoting/host/win:messages", "//remoting/host/win:remoting_lib_idl", @@ -527,9 +571,16 @@ static_library("test_support") { configs += [ "//remoting/build/config:version" ] deps = [ + ":client_session_control", + "//remoting/codec:encoder", + "//remoting/host/file_transfer:common", + "//remoting/host/security_key:security_key", "//remoting/proto", + "//remoting/protocol:protocol", + "//remoting/protocol:test_support", "//testing/gmock", "//testing/gtest", + "//ui/events:events", ] public_deps = [ ":common", @@ -601,20 +652,32 @@ source_set("unit_tests") { configs += [ "//remoting/build/config:version" ] deps = [ + ":base", + ":client_session_control", ":common", ":test_support", "//build:branding_buildflags", "//build:chromeos_buildflags", + "//net:test_support", + "//remoting/codec:encoder", "//remoting/host/file_transfer:unit_tests", + "//remoting/host/input_monitor:input_monitor", "//remoting/host/it2me:common", "//remoting/host/native_messaging", "//remoting/host/security_key:unit_tests", "//remoting/host/setup:common", "//remoting/proto", + "//remoting/proto/remoting/v1:remote_support_host_messages", + "//remoting/protocol:test_support", "//remoting/resources", + "//remoting/signaling", + "//remoting/signaling:test_support", + "//remoting/signaling:unit_tests", "//skia", "//testing/gmock", "//testing/gtest", + "//ui/base:base", + "//ui/events:events", ] if (is_linux && !is_chromeos) { @@ -698,10 +761,14 @@ if (enable_remoting_host) { ] deps += [ + ":common", "//google_apis", "//mojo/core/embedder", "//net", + "//remoting/base:base", "//remoting/host/setup", + "//services/network:network_service", + "//services/network/public/cpp:cpp", ] } } @@ -798,19 +865,30 @@ if (enable_me2me_host) { ] deps = [ + ":base", "//base", "//base:i18n", "//components/policy/core/common", "//ipc", + "//jingle:webrtc_glue", "//mojo/core/embedder", "//net", "//remoting/base", + "//remoting/base:authorization", "//remoting/host", + "//remoting/host/security_key:security_key", "//remoting/proto", + "//remoting/protocol:protocol", + "//remoting/signaling:signaling", + "//services/network/public/cpp:cpp", "//third_party/libjingle_xmpp", "//third_party/webrtc_overrides:webrtc_component", ] + if (use_x11) { + deps += [ "//ui/events/platform/x11:x11" ] + } + if (is_posix) { sources += [ "pam_authorization_factory_posix.cc", @@ -829,8 +907,8 @@ if (enable_me2me_host) { libs = [ "pam" ] } - if (is_mac && is_official_build) { - sources += [ "internal/internal_mac-inl.h" ] + if (is_mac) { + deps += [ "//remoting/host/mac:permission_checking" ] } } @@ -848,8 +926,13 @@ if (enable_me2me_host) { "host_main.h", ] deps = [ + ":base", + ":common", "//base", "//base:debugging_buildflags", + "//mojo/core/embedder:embedder", + "//remoting/base:breakpad", + "//remoting/host/setup:common", ] } if (is_mac) { @@ -868,8 +951,12 @@ if (enable_me2me_host) { deps = [ ":remoting_me2me_host_static", "//base", + "//mojo/core/embedder:embedder", "//remoting/base:breakpad", + "//remoting/host:base", + "//remoting/host:common", "//remoting/host/installer:credits", + "//remoting/host/setup:common", "//remoting/resources", ] } diff --git a/chromium/remoting/host/file_transfer/BUILD.gn b/chromium/remoting/host/file_transfer/BUILD.gn index 66af5986fcd..42ecb936d99 100644 --- a/chromium/remoting/host/file_transfer/BUILD.gn +++ b/chromium/remoting/host/file_transfer/BUILD.gn @@ -40,13 +40,11 @@ source_set("file_transfer") { sources += [ "get_desktop_directory.cc" ] } - if (is_linux && !is_chromeos_lacros) { - sources += [ "file_chooser_linux.cc" ] - deps += [ "//build/config/linux/gtk" ] - } - if (is_chromeos_ash) { sources += [ "file_chooser_chromeos.cc" ] + } else if (is_linux) { + sources += [ "file_chooser_linux.cc" ] + deps += [ "//build/config/linux/gtk" ] } } diff --git a/chromium/remoting/host/input_monitor/BUILD.gn b/chromium/remoting/host/input_monitor/BUILD.gn index 84e6ea623f2..42f4503d3ab 100644 --- a/chromium/remoting/host/input_monitor/BUILD.gn +++ b/chromium/remoting/host/input_monitor/BUILD.gn @@ -39,6 +39,8 @@ source_set("input_monitor") { if (use_x11 && (!is_chromeos_ash || use_ozone)) { sources += [ "local_hotkey_input_monitor_x11.cc", + "local_input_monitor_x11_common.cc", + "local_input_monitor_x11_common.h", "local_keyboard_input_monitor_x11.cc", "local_mouse_input_monitor_x11.cc", ] diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn index f252c618306..3922f4e59dd 100644 --- a/chromium/remoting/host/it2me/BUILD.gn +++ b/chromium/remoting/host/it2me/BUILD.gn @@ -22,6 +22,8 @@ source_set("common") { "it2me_confirmation_dialog.h", "it2me_confirmation_dialog_proxy.cc", "it2me_confirmation_dialog_proxy.h", + "it2me_constants.cc", + "it2me_constants.h", "it2me_host.cc", "it2me_host.h", "it2me_native_messaging_host.cc", @@ -72,20 +74,36 @@ source_set("common") { } } -if (is_chromeos_ash) { +if (is_chromeos_ash || is_chromeos_lacros) { source_set("chrome_os_host") { sources = [ - "it2me_native_messaging_host_chromeos.cc", - "it2me_native_messaging_host_chromeos.h", + "it2me_native_messaging_host_allowed_origins.cc", + "it2me_native_messaging_host_allowed_origins.h", ] - deps = [ - ":common", - "//skia", - ] + if (is_chromeos_lacros) { + sources += [ + "it2me_native_messaging_host_lacros.cc", + "it2me_native_messaging_host_lacros.h", + ] + deps = [ + "//base", + "//extensions/browser/api/messaging:native_messaging", + ] + } else { + sources += [ + "it2me_native_messaging_host_chromeos.cc", + "it2me_native_messaging_host_chromeos.h", + ] - if (use_ozone) { - deps += [ "//ui/ozone" ] + deps = [ + ":common", + "//skia", + ] + + if (use_ozone) { + deps += [ "//ui/ozone" ] + } } } } diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn index 04a9bde0dc2..643126006d1 100644 --- a/chromium/remoting/host/win/BUILD.gn +++ b/chromium/remoting/host/win/BUILD.gn @@ -246,7 +246,7 @@ static_library("remoting_lib_ps") { # Makes the .mc file from the .mc.jinja file. remoting_localize("messages_localizing") { sources = [ "host_messages.mc.jinja2" ] - locales = remoting_locales + locale_list = remoting_locales_without_pseudolocales locale_dir = resources_locale_dir encoding = "utf-16" @@ -358,7 +358,6 @@ shared_library("remoting_core") { "$root_gen_dir/remoting/version.rc", "//remoting/host/desktop_process_main.cc", "//remoting/host/host_main.cc", - "//remoting/host/host_main.h", "//remoting/host/it2me/it2me_native_messaging_host_main.cc", "//remoting/host/it2me/it2me_native_messaging_host_main.h", "//remoting/host/setup/host_starter.cc", @@ -369,35 +368,38 @@ shared_library("remoting_core") { "//remoting/host/setup/me2me_native_messaging_host_main.h", "//remoting/host/setup/start_host_main.cc", "//remoting/host/setup/start_host_main.h", - "//remoting/host/worker_process_ipc_delegate.h", "chromoting_lib.rc", "chromoting_module.cc", "chromoting_module.h", "core.cc", "core.h", - "core_resource.h", "elevated_native_messaging_host.cc", "elevated_native_messaging_host.h", "etw_trace_consumer.cc", - "etw_trace_consumer.h", "etw_trace_controller.cc", "etw_trace_controller.h", "event_trace_data.cc", "event_trace_data.h", "host_event_file_logger.cc", - "host_event_file_logger.h", - "host_event_logger.h", "host_event_windows_event_logger.cc", - "host_event_windows_event_logger.h", "host_service.cc", - "host_service.h", "launch_native_messaging_host_process.cc", "launch_native_messaging_host_process.h", "rdp_desktop_session.cc", "rdp_desktop_session.h", "unprivileged_process_delegate.cc", - "unprivileged_process_delegate.h", "wts_session_process_delegate.cc", + + # TODO(crbug.com/1184893): These files are also listed in //remoting/host:common, so they should probably be moved to a shared target they can both depend on. + "//remoting/host/host_main.h", + "//remoting/host/worker_process_ipc_delegate.h", + "core_resource.h", + "etw_trace_consumer.h", + "host_event_file_logger.h", + "host_event_logger.h", + "host_event_windows_event_logger.h", + "host_service.h", + "unprivileged_process_delegate.h", "wts_session_process_delegate.h", ] @@ -522,5 +524,5 @@ remoting_localize("remoting_windows_resources") { encoding = "utf-16" - locales = remoting_locales + locale_list = remoting_locales_without_pseudolocales } diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn index 0dbbeafcfbb..21de1018940 100644 --- a/chromium/remoting/protocol/BUILD.gn +++ b/chromium/remoting/protocol/BUILD.gn @@ -209,6 +209,8 @@ static_library("protocol") { "webrtc_transport.h", "webrtc_video_renderer_adapter.cc", "webrtc_video_renderer_adapter.h", + "webrtc_video_track_source.cc", + "webrtc_video_track_source.h", ] configs += [ @@ -225,12 +227,15 @@ static_library("protocol") { "//base", "//build:chromeos_buildflags", "//crypto", + "//google_apis:google_apis", "//jingle:jingle_glue", + "//jingle:webrtc_glue", "//net", "//remoting/base", "//remoting/codec:decoder", "//remoting/proto/remoting/v1:network_traversal_proto", "//remoting/signaling", + "//services/network/public/cpp:cpp", "//third_party/boringssl", "//third_party/libyuv", "//third_party/webrtc_overrides:webrtc_component", @@ -269,6 +274,8 @@ static_library("protocol") { "webrtc_frame_scheduler.h", "webrtc_frame_scheduler_simple.cc", "webrtc_frame_scheduler_simple.h", + "webrtc_video_frame_adapter.cc", + "webrtc_video_frame_adapter.h", "webrtc_video_stream.cc", "webrtc_video_stream.h", ] @@ -316,6 +323,18 @@ static_library("test_support") { ":protocol", "//testing/gmock", ] + + deps = [ + "//base:base", + "//net:net", + "//net/traffic_annotation:test_support", + "//net/traffic_annotation:traffic_annotation", + "//remoting/base:base", + "//remoting/codec:encoder", + "//remoting/signaling:signaling", + "//testing/gtest:gtest", + "//third_party/libjingle_xmpp:rtc_xmllite", + ] } source_set("unit_tests") { @@ -371,14 +390,23 @@ source_set("unit_tests") { "video_frame_pump_unittest.cc", "webrtc_audio_source_adapter_unittest.cc", "webrtc_frame_scheduler_unittest.cc", + "webrtc_video_frame_adapter_unittest.cc", ] } deps = [ ":test_support", + "//jingle:webrtc_glue", "//net:test_support", + "//remoting/base:base", + "//remoting/base:test_support", + "//remoting/codec:encoder", "//remoting/proto/remoting/v1:network_traversal_proto", + "//remoting/signaling:test_support", + "//services/network/public/cpp:cpp", "//testing/gmock", "//testing/gtest", + "//third_party/libjingle_xmpp:rtc_xmllite", + "//third_party/libjingle_xmpp:rtc_xmpp", ] } diff --git a/chromium/remoting/remoting_locales.gni b/chromium/remoting/remoting_locales.gni index a9f4d8983d8..3dc3ed8779d 100644 --- a/chromium/remoting/remoting_locales.gni +++ b/chromium/remoting/remoting_locales.gni @@ -3,11 +3,12 @@ # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") +import("//build/config/locales.gni") resources_locale_dir = "$root_gen_dir/remoting/resources/_locales" # See also remoting_locales_with_underscores below. -remoting_locales = [ +remoting_locales_without_pseudolocales = [ "am", "ar", "bg", @@ -67,59 +68,57 @@ remoting_locales = [ "zh-TW", ] -# Some locales have hyphens in the names but for some uses underscores are -# needed. -remoting_locales_with_underscores = remoting_locales -remoting_locales_with_underscores -= [ - "en-GB", - - "pt-PT", - "zh-CN", - "zh-TW", -] -remoting_locales_with_underscores += [ - "en_GB", - - "pt_PT", - "zh_CN", - "zh_TW", -] - # An additional locale "en-US" is generated for ChromeOS and Chrome on iOS. # TODO(yuweih): Our build script doesn't seem to work with en-US and Chrome # on iOS doesn't seem to have en-US.lproj. Add is_ios back if we do need to # work with en-US. if (is_chromeos_ash || is_chromeos_lacros) { - remoting_locales += [ "en-US" ] - remoting_locales_with_underscores += [ "en_US" ] - # Support Icelandic in ChromeOS - remoting_locales += [ "is" ] - remoting_locales_with_underscores += [ "is" ] + remoting_locales_without_pseudolocales += [ + "en-US", + "is", + ] } # Locales "pt-BR" and "es-419" are named "pt" and "es-MX" respectively on iOS. if (!is_ios) { - remoting_locales += [ + remoting_locales_without_pseudolocales += [ "pt-BR", "es-419", ] - remoting_locales_with_underscores += [ - "pt_BR", - "es_419", - ] } else { - remoting_locales += [ + remoting_locales_without_pseudolocales += [ "pt", "es-MX", ] - remoting_locales_with_underscores += [ - "pt", - "es_MX", - ] } -messages_locales = remoting_locales_with_underscores +remoting_locales_with_underscores_without_pseudolocales = [] +foreach(locale, remoting_locales_without_pseudolocales) { + remoting_locales_with_underscores_without_pseudolocales += + [ string_replace(locale, "-", "_") ] +} + +pseudolocales_with_underscores = [] +foreach(locale, pseudolocales) { + pseudolocales_with_underscores += [ string_replace(locale, "-", "_") ] +} + +remoting_locales_with_pseudolocales = + remoting_locales_without_pseudolocales + pseudolocales +remoting_locales_with_underscores_with_pseudolocales = + remoting_locales_with_underscores_without_pseudolocales + + pseudolocales_with_underscores + +if (enable_pseudolocales) { + remoting_locales = remoting_locales_with_pseudolocales + remoting_locales_with_underscores = + remoting_locales_with_underscores_with_pseudolocales +} else { + remoting_locales = remoting_locales_without_pseudolocales + remoting_locales_with_underscores = + remoting_locales_with_underscores_without_pseudolocales +} remoting_android_locales = [ "am", @@ -170,5 +169,5 @@ remoting_android_locales = [ # The list of .json files generated by remoting_strings.grd. remoting_resources_locale_files = process_file_template( - messages_locales, + remoting_locales_with_underscores_with_pseudolocales, [ "remoting/resources/_locales/{{source_name_part}}/messages.json" ]) diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn index 868d23702e3..24250663b26 100644 --- a/chromium/remoting/resources/BUILD.gn +++ b/chromium/remoting/resources/BUILD.gn @@ -61,7 +61,7 @@ grit("strings") { # The grd produces a *.pak file and a messages.json file (this one uses # underscores instead of hyphens) for each locale. outputs += - process_file_template(remoting_locales, + process_file_template(remoting_locales_with_pseudolocales, [ "remoting/resources/{{source_name_part}}.pak" ]) outputs += remoting_resources_locale_files diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn index 3145636f7cd..52a0ee34ea2 100644 --- a/chromium/remoting/test/BUILD.gn +++ b/chromium/remoting/test/BUILD.gn @@ -62,6 +62,7 @@ static_library("test_support") { deps = [ "//google_apis", + "//jingle:webrtc_glue", "//remoting/base:authorization", "//remoting/base:test_support", "//services/network:network_service", @@ -102,6 +103,7 @@ if (enable_remoting_host && !is_android && !is_chromeos_ash && ":test_support", "//mojo/core/embedder", "//remoting/base", + "//remoting/base:authorization", "//remoting/host", "//remoting/host/it2me:common", "//remoting/host/native_messaging", @@ -120,6 +122,8 @@ if (enable_remoting_host && !is_android && !is_chromeos_ash && deps = [ ":fake_connection_event_logger", "//base/test:test_support", + "//remoting/protocol:protocol", + "//remoting/protocol:test_support", "//third_party/webrtc_overrides:webrtc_component", ] @@ -139,7 +143,10 @@ if (enable_remoting_host && !is_android && !is_chromeos_ash && deps = [ ":it2me_standalone_host" ] if (is_linux || is_chromeos_lacros) { - deps += [ "//build/config/linux/gtk" ] + deps += [ + "//build/config/linux/gtk", + "//ui/events/platform/x11:x11", + ] } if (is_win) { @@ -158,7 +165,10 @@ if (enable_remoting_host && !is_android && !is_chromeos_ash && testonly = true sources = [ "capability_test_stub_main.cc" ] - deps = [ "//base" ] + deps = [ + "//base", + "//remoting/host:base", + ] } } @@ -174,7 +184,10 @@ executable("ftl_services_playground") { ":test_support", "//mojo/core/embedder", "//remoting/base", + "//remoting/base:authorization", + "//remoting/proto/ftl/v1:ftl_messages", "//remoting/signaling", + "//services/network:network_service", ] } @@ -188,8 +201,11 @@ executable("ftl_signaling_playground") { ] deps = [ ":test_support", + "//jingle:webrtc_glue", "//mojo/core/embedder", "//remoting/base", + "//remoting/base:authorization", "//remoting/signaling", + "//services/network:network_service", ] } diff --git a/chromium/remoting/tools/build/remoting_localize.gni b/chromium/remoting/tools/build/remoting_localize.gni index a0bdb4cce7f..1b4faf37132 100644 --- a/chromium/remoting/tools/build/remoting_localize.gni +++ b/chromium/remoting/tools/build/remoting_localize.gni @@ -11,7 +11,7 @@ import("//build/config/python.gni") # sources (required) # List of jinja2 files to load. This is the template. # -# locales (required) +# locale_list (required) # List of locales. # # locale_dir (optional) @@ -23,7 +23,7 @@ import("//build/config/python.gni") # variables (optional) # List of variables to pass to script. # -# output (optiona) +# output (optional) # Substitution pattern for the output. Defaults to a file in the target # gen dir with the extension stripped (normally the extension is ".jinja2" # which then leaves the non-tempaltized file name). @@ -98,7 +98,7 @@ template("remoting_localize") { ] } - args += invoker.locales + args += invoker.locale_list if (defined(invoker.deps)) { deps = invoker.deps |