diff options
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/android/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/base/BUILD.gn | 30 | ||||
-rw-r--r-- | chromium/remoting/client/audio/BUILD.gn | 12 | ||||
-rw-r--r-- | chromium/remoting/client/input/BUILD.gn | 20 | ||||
-rw-r--r-- | chromium/remoting/host/BUILD.gn | 26 | ||||
-rw-r--r-- | chromium/remoting/host/file_transfer/BUILD.gn | 10 | ||||
-rw-r--r-- | chromium/remoting/host/input_monitor/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/host/installer/mac/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/host/it2me/BUILD.gn | 11 | ||||
-rw-r--r-- | chromium/remoting/host/security_key/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/host/setup/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/protocol/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/signaling/BUILD.gn | 3 |
13 files changed, 118 insertions, 26 deletions
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn index 86169ad34e9..ad5957f4a6c 100644 --- a/chromium/remoting/android/BUILD.gn +++ b/chromium/remoting/android/BUILD.gn @@ -40,7 +40,6 @@ remoting_localize("remoting_apk_manifest") { } android_resources("remoting_android_client_java_resources") { - create_srcjar = false sources = [ "java/res/drawable-hdpi/empty_host_list.png", "java/res/drawable-hdpi/ic_action_full_screen.png", diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn index 465766e0d3b..35628d0e5a5 100644 --- a/chromium/remoting/base/BUILD.gn +++ b/chromium/remoting/base/BUILD.gn @@ -4,6 +4,12 @@ import("//third_party/protobuf/proto_library.gni") +# Reset sources_assignment_filter for the BUILD.gn file to prevent +# regression during the migration of Chromium away from the feature. +# See docs/no_sources_assignment_filter.md for more information. +# TODO(crbug.com/1018739): remove this when migration is done. +set_sources_assignment_filter([]) + proto_library("protobuf_http_client_messages_proto") { sources = [ "protobuf_http_client_messages.proto" ] } @@ -54,7 +60,6 @@ source_set("base") { "running_samples.h", "scoped_protobuf_http_request.cc", "scoped_protobuf_http_request.h", - "scoped_sc_handle_win.h", "service_urls.cc", "service_urls.h", "session_options.cc", @@ -99,6 +104,10 @@ source_set("base") { "//third_party/webrtc_overrides:webrtc_component", "//url", ] + + if (is_win) { + sources += [ "scoped_sc_handle_win.h" ] + } } source_set("authorization") { @@ -129,20 +138,23 @@ source_set("authorization") { } source_set("breakpad") { - sources = [ - "breakpad.h", - "breakpad_linux.cc", - "breakpad_mac.mm", - "breakpad_win.cc", - ] + sources = [ "breakpad.h" ] configs += [ "//build/config/compiler:wexit_time_destructors" ] deps = [ "//base" ] + if (is_linux || is_chromeos) { + sources += [ "breakpad_linux.cc" ] + } + if (is_mac) { + sources += [ "breakpad_mac.mm" ] deps += [ "//third_party/breakpad" ] - } else if (is_win) { + } + + if (is_win) { + sources += [ "breakpad_win.cc" ] deps += [ "//third_party/breakpad:breakpad_handler" ] } } @@ -199,7 +211,6 @@ source_set("unit_tests") { sources = [ "auto_thread_task_runner_unittest.cc", "auto_thread_unittest.cc", - "breakpad_win_unittest.cc", "buffered_socket_writer_unittest.cc", "capabilities_unittest.cc", "compound_buffer_unittest.cc", @@ -233,6 +244,7 @@ source_set("unit_tests") { } if (is_win) { + sources += [ "breakpad_win_unittest.cc" ] libs = [ "rpcrt4.lib" ] # For UuidCreate in breakpad_win_unittest.cc. } } diff --git a/chromium/remoting/client/audio/BUILD.gn b/chromium/remoting/client/audio/BUILD.gn index 2f1ada2f009..a84301a4677 100644 --- a/chromium/remoting/client/audio/BUILD.gn +++ b/chromium/remoting/client/audio/BUILD.gn @@ -2,6 +2,12 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# Reset sources_assignment_filter for the BUILD.gn file to prevent +# regression during the migration of Chromium away from the feature. +# See docs/no_sources_assignment_filter.md for more information. +# TODO(crbug.com/1018739): remove this when migration is done. +set_sources_assignment_filter([]) + source_set("audio") { sources = [ "async_audio_data_supplier.cc", @@ -13,8 +19,6 @@ source_set("audio") { "audio_playback_stream.h", "audio_player.cc", "audio_player.h", - "audio_player_android.cc", - "audio_player_android.h", "audio_stream_format.cc", "audio_stream_format.h", ] @@ -30,6 +34,10 @@ source_set("audio") { libs = [] if (is_android) { + sources += [ + "audio_player_android.cc", + "audio_player_android.h", + ] libs += [ "android", "OpenSLES", diff --git a/chromium/remoting/client/input/BUILD.gn b/chromium/remoting/client/input/BUILD.gn index 0c6e425712a..97cb32df90a 100644 --- a/chromium/remoting/client/input/BUILD.gn +++ b/chromium/remoting/client/input/BUILD.gn @@ -2,6 +2,12 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# Reset sources_assignment_filter for the BUILD.gn file to prevent +# regression during the migration of Chromium away from the feature. +# See docs/no_sources_assignment_filter.md for more information. +# TODO(crbug.com/1018739): remove this when migration is done. +set_sources_assignment_filter([]) + source_set("input") { sources = [ "client_input_injector.h", @@ -16,8 +22,6 @@ source_set("input") { "keycode_map.h", "native_device_keymap.cc", "native_device_keymap.h", - "native_device_keymap_android.cc", - "native_device_keymap_ios.cc", "text_keyboard_input_strategy.cc", "text_keyboard_input_strategy.h", "touch_input_scaler.cc", @@ -36,6 +40,14 @@ source_set("input") { "//ui/events:dom_keycode_converter", ] + if (is_android) { + sources += [ "native_device_keymap_android.cc" ] + } + + if (is_ios) { + sources += [ "native_device_keymap_ios.cc" ] + } + if (is_android || is_ios) { sources -= [ "native_device_keymap.cc" ] } @@ -44,7 +56,6 @@ source_set("input") { source_set("normalizing_input_filter") { # Disabled the source filters because there are _mac files that need to # be compiled on all platforms. - set_sources_assignment_filter([]) sources = [ "normalizing_input_filter_cros.cc", "normalizing_input_filter_cros.h", @@ -53,7 +64,6 @@ source_set("normalizing_input_filter") { "normalizing_input_filter_win.cc", "normalizing_input_filter_win.h", ] - set_sources_assignment_filter(sources_assignment_filter) deps = [ "//remoting/base", @@ -92,13 +102,11 @@ source_set("unit_tests") { source_set("normalizing_input_filter_unit_tests") { testonly = true - set_sources_assignment_filter([]) sources = [ "normalizing_input_filter_cros_unittest.cc", "normalizing_input_filter_mac_unittest.cc", "normalizing_input_filter_win_unittest.cc", ] - set_sources_assignment_filter(sources_assignment_filter) configs += [ "//remoting/build/config:version", diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index ed194346261..4ccd546c2d3 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -5,6 +5,13 @@ import("//build/util/process_version.gni") import("//remoting/build/config/remoting_build.gni") +# This file depends on the legacy global sources assignment filter. It should +# be converted to check target platform before assigning source files to the +# sources variable. Remove this import and set_sources_assignment_filter call +# when the file has been converted. See https://crbug.com/1018739 for details. +import("//build/config/deprecated_default_sources_assignment_filter.gni") +set_sources_assignment_filter(deprecated_default_sources_assignment_filter) + group("all_tests") { testonly = true @@ -146,8 +153,10 @@ static_library("common") { "desktop_resizer.h", "desktop_resizer_mac.cc", "desktop_resizer_ozone.cc", + "desktop_resizer_ozone.h", "desktop_resizer_win.cc", "desktop_resizer_x11.cc", + "desktop_resizer_x11.h", "desktop_session.cc", "desktop_session.h", "desktop_session_agent.cc", @@ -297,6 +306,8 @@ static_library("common") { "xmpp_register_support_host_request.h", "xsession_chooser_linux.cc", "xsession_chooser_ui.inc", + "zombie_host_detector.cc", + "zombie_host_detector.h", ] libs = [] @@ -353,6 +364,7 @@ static_library("common") { } if (is_linux && !is_chromeos) { + sources += [ "desktop_resizer_linux.cc" ] public_deps += [ "//remoting/host/linux" ] libs += [ "pam" ] } @@ -360,6 +372,7 @@ static_library("common") { if (use_x11) { deps += [ "//remoting/host/linux:x11", + "//ui/events/platform/x11", "//ui/gfx/x", ] if (is_desktop_linux) { @@ -369,12 +382,16 @@ static_library("common") { sources -= [ "clipboard_x11.cc", "desktop_resizer_x11.cc", + "desktop_resizer_x11.h", "input_injector_x11.cc", ] } if (!use_ozone) { - sources -= [ "desktop_resizer_ozone.cc" ] + sources -= [ + "desktop_resizer_ozone.cc", + "desktop_resizer_ozone.h", + ] } if (is_chromeos) { @@ -399,11 +416,15 @@ static_library("common") { if (use_ozone) { deps += [ "//ui/ozone" ] - sources -= [ "desktop_resizer_ozone.cc" ] + sources -= [ + "desktop_resizer_ozone.cc", + "desktop_resizer_ozone.h", + ] } else { sources -= [ "clipboard_x11.cc", "desktop_resizer_x11.cc", + "desktop_resizer_x11.h", "input_injector_chromeos.cc", "input_injector_chromeos.h", ] @@ -520,6 +541,7 @@ source_set("unit_tests") { "token_validator_factory_impl_unittest.cc", "touch_injector_win_unittest.cc", "xmpp_register_support_host_request_unittest.cc", + "zombie_host_detector_unittest.cc", ] if (use_ozone || is_chromeos) { diff --git a/chromium/remoting/host/file_transfer/BUILD.gn b/chromium/remoting/host/file_transfer/BUILD.gn index bfc32bfc507..c7a9eb7e146 100644 --- a/chromium/remoting/host/file_transfer/BUILD.gn +++ b/chromium/remoting/host/file_transfer/BUILD.gn @@ -4,6 +4,13 @@ import("//remoting/build/config/remoting_build.gni") +# This file depends on the legacy global sources assignment filter. It should +# be converted to check target platform before assigning source files to the +# sources variable. Remove this import and set_sources_assignment_filter call +# when the file has been converted. See https://crbug.com/1018739 for details. +import("//build/config/deprecated_default_sources_assignment_filter.gni") +set_sources_assignment_filter(deprecated_default_sources_assignment_filter) + source_set("file_transfer") { sources = [ "ensure_user_mac.cc", @@ -50,6 +57,7 @@ source_set("common") { "file_transfer_message_handler.h", "ipc_file_operations.h", "local_file_operations.h", + "rtc_log_file_operations.h", "session_file_operations_handler.h", ] @@ -61,6 +69,7 @@ source_set("common") { "file_transfer_message_handler.cc", "ipc_file_operations.cc", "local_file_operations.cc", + "rtc_log_file_operations.cc", "session_file_operations_handler.cc", ] @@ -96,6 +105,7 @@ source_set("unit_tests") { "file_transfer_message_handler_unittest.cc", "ipc_file_operations_unittest.cc", "local_file_operations_unittest.cc", + "rtc_log_file_operations_unittest.cc", ] deps = [ diff --git a/chromium/remoting/host/input_monitor/BUILD.gn b/chromium/remoting/host/input_monitor/BUILD.gn index c25d0c5cb09..68f3bf6152c 100644 --- a/chromium/remoting/host/input_monitor/BUILD.gn +++ b/chromium/remoting/host/input_monitor/BUILD.gn @@ -4,6 +4,13 @@ import("//remoting/build/config/remoting_build.gni") +# This file depends on the legacy global sources assignment filter. It should +# be converted to check target platform before assigning source files to the +# sources variable. Remove this import and set_sources_assignment_filter call +# when the file has been converted. See https://crbug.com/1018739 for details. +import("//build/config/deprecated_default_sources_assignment_filter.gni") +set_sources_assignment_filter(deprecated_default_sources_assignment_filter) + source_set("input_monitor") { public = [ "local_input_monitor.h" ] diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn index 490ebf8fef4..d1ec6349240 100644 --- a/chromium/remoting/host/installer/mac/BUILD.gn +++ b/chromium/remoting/host/installer/mac/BUILD.gn @@ -6,6 +6,13 @@ import("//build/config/zip.gni") import("//chrome/installer/mac/mac_signing_sources.gni") import("//remoting/build/config/remoting_build.gni") +# This file depends on the legacy global sources assignment filter. It should +# be converted to check target platform before assigning source files to the +# sources variable. Remove this import and set_sources_assignment_filter call +# when the file has been converted. See https://crbug.com/1018739 for details. +import("//build/config/deprecated_default_sources_assignment_filter.gni") +set_sources_assignment_filter(deprecated_default_sources_assignment_filter) + action("remoting_me2me_host_archive") { _installer_mac_files = [ "do_signing.sh", diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn index a63a8a3a94d..7035f316a4a 100644 --- a/chromium/remoting/host/it2me/BUILD.gn +++ b/chromium/remoting/host/it2me/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/features.gni") +import("//build/config/ui.gni") import("//remoting/remoting_locales.gni") import("//remoting/remoting_options.gni") import("//remoting/remoting_version.gni") @@ -14,9 +15,13 @@ if (is_mac) { import("//build/config/mac/rules.gni") import("//third_party/icu/config.gni") } -if (is_chromeos) { - import("//ui/ozone/ozone.gni") -} + +# This file depends on the legacy global sources assignment filter. It should +# be converted to check target platform before assigning source files to the +# sources variable. Remove this import and set_sources_assignment_filter call +# when the file has been converted. See https://crbug.com/1018739 for details. +import("//build/config/deprecated_default_sources_assignment_filter.gni") +set_sources_assignment_filter(deprecated_default_sources_assignment_filter) source_set("common") { sources = [ diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn index 3575159f296..762201e12a6 100644 --- a/chromium/remoting/host/security_key/BUILD.gn +++ b/chromium/remoting/host/security_key/BUILD.gn @@ -4,6 +4,13 @@ import("//remoting/build/config/remoting_build.gni") +# This file depends on the legacy global sources assignment filter. It should +# be converted to check target platform before assigning source files to the +# sources variable. Remove this import and set_sources_assignment_filter call +# when the file has been converted. See https://crbug.com/1018739 for details. +import("//build/config/deprecated_default_sources_assignment_filter.gni") +set_sources_assignment_filter(deprecated_default_sources_assignment_filter) + source_set("security_key") { sources = [ "security_key_auth_handler.h", diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn index 284bf27aea0..b8db816b6de 100644 --- a/chromium/remoting/host/setup/BUILD.gn +++ b/chromium/remoting/host/setup/BUILD.gn @@ -2,6 +2,13 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# This file depends on the legacy global sources assignment filter. It should +# be converted to check target platform before assigning source files to the +# sources variable. Remove this import and set_sources_assignment_filter call +# when the file has been converted. See https://crbug.com/1018739 for details. +import("//build/config/deprecated_default_sources_assignment_filter.gni") +set_sources_assignment_filter(deprecated_default_sources_assignment_filter) + source_set("setup") { public_deps = [ ":common" ] deps = [ "//remoting/host" ] diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn index fdd9be6472a..7f9660792c1 100644 --- a/chromium/remoting/protocol/BUILD.gn +++ b/chromium/remoting/protocol/BUILD.gn @@ -203,6 +203,8 @@ static_library("protocol") { "webrtc_data_stream_adapter.h", "webrtc_dummy_video_encoder.cc", "webrtc_dummy_video_encoder.h", + "webrtc_event_log_data.cc", + "webrtc_event_log_data.h", "webrtc_transport.cc", "webrtc_transport.h", "webrtc_video_renderer_adapter.cc", @@ -356,6 +358,7 @@ source_set("unit_tests") { "third_party_authenticator_unittest.cc", "v2_authenticator_unittest.cc", "validating_authenticator_unittest.cc", + "webrtc_event_log_data_unittest.cc", "webrtc_transport_unittest.cc", ] diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn index 6c2ee1044cd..7d122a8bbf0 100644 --- a/chromium/remoting/signaling/BUILD.gn +++ b/chromium/remoting/signaling/BUILD.gn @@ -38,10 +38,7 @@ static_library("signaling") { "signaling_address.h", "signaling_id_util.cc", "signaling_id_util.h", - "signaling_tracker.cc", "signaling_tracker.h", - "signaling_tracker_impl.cc", - "signaling_tracker_impl.h", "xmpp_log_to_server.cc", "xmpp_log_to_server.h", ] |