diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
| commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
| tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/remoting | |
| parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
| download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz | |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/remoting')
35 files changed, 149 insertions, 1333 deletions
diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn index a00b64599bc..65e61ff1d77 100644 --- a/chromium/remoting/BUILD.gn +++ b/chromium/remoting/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//components/nacl/features.gni") import("//remoting/build/config/remoting_build.gni") group("remoting_all") { @@ -10,15 +9,8 @@ group("remoting_all") { deps = [ ":remoting_unittests", - "//remoting/test:chromoting_test_driver", - "//remoting/webapp:browser_test_resources", - "//remoting/webapp:unit_tests", ] - if ((is_linux && !is_chromeos) || is_win || is_mac) { - deps += [ "//remoting/webapp" ] - } - if (is_win) { deps += [ "//remoting:remoting_breakpad_tester", @@ -80,10 +72,6 @@ group("remoting_all") { deps += [ "//remoting/host:remoting_me2me_host_archive" ] } } - - if (enable_nacl) { - deps += [ "//remoting/tools/javascript_key_tester" ] - } } if (is_win) { @@ -162,7 +150,6 @@ test("remoting_unittests") { "//remoting/client/ui:unit_tests", "//remoting/protocol:unit_tests", "//remoting/signaling:unit_tests", - "//remoting/test:unit_tests", "//testing/gmock", "//testing/gtest", ] @@ -175,7 +162,7 @@ test("remoting_unittests") { ] } - deps += [ "//third_party/webrtc_overrides:init_webrtc" ] + deps += [ "//third_party/webrtc_overrides:webrtc_component" ] if (is_android) { deps += [ "//net/android:net_java" ] @@ -218,12 +205,9 @@ if (enable_remoting_host) { "//net:test_support", "//remoting/base", "//testing/gtest", - "//third_party/webrtc/modules/desktop_capture", - "//third_party/webrtc_overrides", + "//third_party/webrtc_overrides:webrtc_component", ] - deps += [ "//third_party/webrtc_overrides:init_webrtc" ] - if (is_win) { defines += [ "_ALT_NO_EXCEPTIONS" ] diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn index fcad9b50070..d6fd128b44e 100644 --- a/chromium/remoting/android/BUILD.gn +++ b/chromium/remoting/android/BUILD.gn @@ -102,4 +102,7 @@ instrumentation_test_apk("remoting_test_apk") { "//third_party/android_support_test_runner:runner_java", "//third_party/junit:junit", ] + if (!is_java_debug) { + proguard_enabled = true + } } diff --git a/chromium/remoting/android/remoting_apk_tmpl.gni b/chromium/remoting/android/remoting_apk_tmpl.gni index 22607887d9f..80fb2e6e1cc 100644 --- a/chromium/remoting/android/remoting_apk_tmpl.gni +++ b/chromium/remoting/android/remoting_apk_tmpl.gni @@ -10,7 +10,19 @@ template("remoting_apk_tmpl") { android_apk(target_name) { forward_variables_from(invoker, "*") - enable_multidex = false + if (!is_java_debug) { + proguard_enabled = true + enable_multidex = false + disable_checkdiscard = true + if (!defined(proguard_configs)) { + proguard_configs = [] + } + proguard_configs += [ + "//remoting/android/proguard.flags", + "//base/android/proguard/chromium_apk.flags", + "//base/android/proguard/chromium_code.flags", + ] + } android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml" android_manifest_dep = "//remoting/android:remoting_apk_manifest" diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn index 31342403ad0..a2a2cea96eb 100644 --- a/chromium/remoting/base/BUILD.gn +++ b/chromium/remoting/base/BUILD.gn @@ -69,7 +69,7 @@ source_set("base") { "//remoting/base/grpc_support", "//third_party/libvpx", "//third_party/libyuv", - "//third_party/webrtc/modules/desktop_capture:primitives", + "//third_party/webrtc_overrides:webrtc_component", "//url", ] if (is_nacl) { @@ -198,7 +198,7 @@ source_set("unit_tests") { "//mojo/core/embedder", "//net:test_support", "//third_party/libyuv", - "//third_party/webrtc/modules/desktop_capture:primitives", + "//third_party/webrtc_overrides:webrtc_component", ] if (is_win || is_mac || is_chromeos) { diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn index 2026b2da789..835723d55df 100644 --- a/chromium/remoting/client/BUILD.gn +++ b/chromium/remoting/client/BUILD.gn @@ -6,6 +6,10 @@ static_library("client") { sources = [ "chromoting_client.cc", "chromoting_client.h", + "chromoting_client_runtime.cc", + "chromoting_client_runtime.h", + "chromoting_session.cc", + "chromoting_session.h", "client_context.cc", "client_context.h", "client_telemetry_logger.cc", @@ -15,6 +19,8 @@ static_library("client") { "connect_to_host_info.h", "cursor_shape_stub_proxy.cc", "cursor_shape_stub_proxy.h", + "dual_buffer_frame_consumer.cc", + "dual_buffer_frame_consumer.h", "empty_cursor_filter.cc", "empty_cursor_filter.h", "feedback_data.cc", @@ -40,48 +46,34 @@ static_library("client") { ] deps = [ + "//mojo/core/embedder", + "//remoting/base:authorization", "//remoting/client/audio", + "//remoting/client/input", "//remoting/client/notification", + "//remoting/client/ui", "//remoting/codec:decoder", "//remoting/protocol", + "//services/network:network_service", + "//services/network/public/mojom", "//third_party/libyuv", - "//third_party/webrtc/modules/desktop_capture:primitives", + "//third_party/webrtc_overrides:webrtc_component", "//ui/events:dom_keycode_converter", ] libs = [] - if (is_nacl) { - sources -= [ "client_telemetry_logger.cc" ] - } else { + if (!is_chromeos) { + # GestureInterpreter depends on //remoting/client/display, which currently + # doesn't build on CrOS. crbug.com/869578 sources += [ - "chromoting_client_runtime.cc", - "chromoting_client_runtime.h", - "chromoting_session.cc", - "chromoting_session.h", - "dual_buffer_frame_consumer.cc", - "dual_buffer_frame_consumer.h", + "gesture_interpreter.cc", + "gesture_interpreter.h", ] - deps += [ - "//mojo/core/embedder", - "//remoting/base:authorization", - "//remoting/client/input", - "//remoting/client/ui", - "//services/network:network_service", - "//services/network/public/mojom", - ] - - if (!is_chromeos) { - # GestureInterpreter depends on //remoting/client/display, which currently - # doesn't build on CrOS. crbug.com/869578 - sources += [ - "gesture_interpreter.cc", - "gesture_interpreter.h", - ] - deps += [ "//remoting/client/display" ] - } + deps += [ "//remoting/client/display" ] } + if (is_android) { libs += [ "android" ] } @@ -109,6 +101,6 @@ source_set("unit_tests") { "//remoting/proto", "//testing/gmock", "//testing/gtest", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] } diff --git a/chromium/remoting/client/display/BUILD.gn b/chromium/remoting/client/display/BUILD.gn index 6f581ece19f..1aebe485781 100644 --- a/chromium/remoting/client/display/BUILD.gn +++ b/chromium/remoting/client/display/BUILD.gn @@ -36,7 +36,7 @@ source_set("display") { deps = [ "//third_party/libyuv", "//third_party/protobuf:protobuf_lite", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] public_configs = [ "//third_party/khronos:khronos_headers" ] @@ -94,7 +94,7 @@ if (is_win) { "//remoting/proto", "//testing/gmock", "//testing/gtest", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] } } diff --git a/chromium/remoting/client/input/BUILD.gn b/chromium/remoting/client/input/BUILD.gn index a76375a1b12..17b12228207 100644 --- a/chromium/remoting/client/input/BUILD.gn +++ b/chromium/remoting/client/input/BUILD.gn @@ -31,7 +31,7 @@ source_set("input") { ":normalizing_input_filter", "//remoting/base", "//remoting/client/ui:ui_manipulation", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", "//ui/events:dom_keycode_converter", ] @@ -56,8 +56,7 @@ source_set("normalizing_input_filter") { deps = [ "//remoting/base", - "//third_party/webrtc/modules/desktop_capture:primitives", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", "//ui/events:dom_keycode_converter", ] } @@ -82,7 +81,7 @@ source_set("unit_tests") { "//remoting/proto", "//testing/gmock", "//testing/gtest", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] } @@ -107,6 +106,6 @@ source_set("normalizing_input_filter_unit_tests") { "//remoting/proto", "//testing/gmock", "//testing/gtest", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] } diff --git a/chromium/remoting/client/plugin/BUILD.gn b/chromium/remoting/client/plugin/BUILD.gn deleted file mode 100644 index 7b121e3cd2e..00000000000 --- a/chromium/remoting/client/plugin/BUILD.gn +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2015 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("//components/nacl/features.gni") -assert(enable_nacl) - -assert(is_nacl, - "These targets must only be built using the untrusted NaCl toolchains.") - -import("//build/config/features.gni") - -executable("remoting_client_plugin_newlib") { - sources = [ - "chromoting_instance.cc", - "chromoting_instance.h", - "pepper_address_resolver.cc", - "pepper_address_resolver.h", - "pepper_audio_player.cc", - "pepper_audio_player.h", - "pepper_cursor_setter.cc", - "pepper_cursor_setter.h", - "pepper_input_handler.cc", - "pepper_input_handler.h", - "pepper_main_thread_task_runner.cc", - "pepper_main_thread_task_runner.h", - "pepper_module.cc", - "pepper_mouse_locker.cc", - "pepper_mouse_locker.h", - "pepper_network_manager.cc", - "pepper_network_manager.h", - "pepper_packet_socket_factory.cc", - "pepper_packet_socket_factory.h", - "pepper_port_allocator_factory.cc", - "pepper_port_allocator_factory.h", - "pepper_url_request.cc", - "pepper_url_request.h", - "pepper_util.cc", - "pepper_util.h", - "pepper_video_renderer.h", - "pepper_video_renderer_2d.cc", - "pepper_video_renderer_2d.h", - "pepper_video_renderer_3d.cc", - "pepper_video_renderer_3d.h", - ] - - configs += [ "//build/config/compiler:wexit_time_destructors" ] - - deps = [ - "//net", - "//ppapi/cpp", - "//ppapi/native_client:ppapi_lib", - "//remoting/base", - "//remoting/client", - "//remoting/client/audio", - "//remoting/client/input", - "//remoting/protocol", - "//remoting/signaling", - "//third_party/libyuv", - "//third_party/webrtc/api:packet_socket_factory", - "//third_party/webrtc/modules/desktop_capture:primitives", - "//third_party/webrtc_overrides:metrics", - "//third_party/webrtc_overrides:task_queue_impl", - "//ui/events:dom_keycode_converter", - ] - - include_dirs = [ "//ppapi/lib/gl/include" ] -} - -if (enable_nacl && is_debug) { - copy("remoting_client_plugin_newlib_debug") { - public_deps = [ - ":remoting_client_plugin_newlib", - ] - sources = [ - "$root_out_dir/exe.unstripped/remoting_client_plugin_newlib.pexe", - ] - outputs = [ - "$root_out_dir/remoting_client_plugin_newlib.pexe.debug", - ] - } -} diff --git a/chromium/remoting/client/ui/BUILD.gn b/chromium/remoting/client/ui/BUILD.gn index 8b219098ba8..9cbda24458d 100644 --- a/chromium/remoting/client/ui/BUILD.gn +++ b/chromium/remoting/client/ui/BUILD.gn @@ -16,7 +16,7 @@ source_set("ui") { public_deps = [ "//remoting/proto", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] if (!is_chromeos) { @@ -36,7 +36,7 @@ source_set("ui_manipulation") { public_deps = [ "//remoting/proto", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] } diff --git a/chromium/remoting/codec/BUILD.gn b/chromium/remoting/codec/BUILD.gn index 15c181d5fc3..486ed1f04da 100644 --- a/chromium/remoting/codec/BUILD.gn +++ b/chromium/remoting/codec/BUILD.gn @@ -34,7 +34,7 @@ source_set("encoder") { "//third_party/libvpx", "//third_party/libyuv", "//third_party/opus", - "//third_party/webrtc/modules/desktop_capture:primitives", + "//third_party/webrtc_overrides:webrtc_component", "//ui/gfx:color_space", "//ui/gfx/geometry", ] @@ -42,9 +42,7 @@ source_set("encoder") { # Currently, building WebrtcVideoEncoderGpu is only supported on Windows and # Linux, and encoding with WebrtcVideoEncoderGpu is only supported on Windows. if (is_win || is_linux) { - public_configs = [ - "//skia:skia_config", - ] + public_configs = [ "//skia:skia_config" ] sources += [ "webrtc_video_encoder_gpu.cc", "webrtc_video_encoder_gpu.h", @@ -95,7 +93,7 @@ source_set("decoder") { "//third_party/libvpx", "//third_party/libyuv", "//third_party/opus", - "//third_party/webrtc/modules/desktop_capture:primitives", + "//third_party/webrtc_overrides:webrtc_component", ] } @@ -115,7 +113,7 @@ source_set("vpx_codec") { "//base/third_party/dynamic_annotations", "//remoting/proto", "//third_party/libyuv", - "//third_party/webrtc/modules/desktop_capture:primitives", + "//third_party/webrtc_overrides:webrtc_component", ] } @@ -141,7 +139,7 @@ source_set("unit_tests") { "//base", "//remoting/proto", "//testing/gtest", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", "//ui/gfx:color_space", ] diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index 09942bceb10..e7ea946b458 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -62,6 +62,8 @@ source_set("base") { "logging_linux.cc", "logging_mac.cc", "logging_win.cc", + "switches.cc", + "switches.h", "username.cc", "username.h", ] @@ -176,10 +178,6 @@ static_library("common") { "ftl_host_change_notification_listener.h", "ftl_signaling_connector.cc", "ftl_signaling_connector.h", - "gcd_rest_client.cc", - "gcd_rest_client.h", - "gcd_state_updater.cc", - "gcd_state_updater.h", "heartbeat_sender.cc", "heartbeat_sender.h", "host_attributes.cc", @@ -284,8 +282,6 @@ static_library("common") { "single_window_input_injector_linux.cc", "single_window_input_injector_mac.cc", "single_window_input_injector_win.cc", - "switches.cc", - "switches.h", "test_echo_extension.cc", "test_echo_extension.h", "test_echo_extension_session.cc", @@ -335,7 +331,7 @@ static_library("common") { "//remoting/protocol", "//remoting/resources", "//services/network:network_service", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", # //remoting uses the power_save_blocker directly. See crbug.com/689423 "//services/device/wake_lock/power_save_blocker", @@ -425,13 +421,11 @@ static_library("common") { "Carbon.framework", ] - deps += [ - ":remoting_version", - "//third_party/google_toolbox_for_mac", - ] + deps += [ ":remoting_version" ] } if (is_win) { + libs += [ "crypt32.lib" ] deps += [ # On Windows, we use //media/gpu/MediaFoundationVideoEncodeAcceleratorWin # to detect whether HW encoder is supported by the system. @@ -472,8 +466,7 @@ static_library("test_support") { "//remoting/host/file_transfer:test_support", "//third_party/libjingle_xmpp", "//third_party/protobuf:protobuf_lite", - "//third_party/webrtc/modules/desktop_capture", - "//third_party/webrtc_overrides:init_webrtc", + "//third_party/webrtc_overrides:webrtc_component", ] } @@ -495,8 +488,6 @@ source_set("unit_tests") { "desktop_session_agent_unittest.cc", "ftl_host_change_notification_listener_unittest.cc", "ftl_signaling_connector_unittest.cc", - "gcd_rest_client_unittest.cc", - "gcd_state_updater_unittest.cc", "heartbeat_sender_unittest.cc", "host_attributes_unittest.cc", "host_config_unittest.cc", @@ -611,7 +602,7 @@ if (enable_remoting_host) { deps = [ "//third_party/libjingle_xmpp", - "//third_party/webrtc_overrides:init_webrtc", + "//third_party/webrtc_overrides:webrtc_component", ] configs += [ "//build/config/compiler:wexit_time_destructors" ] @@ -699,7 +690,7 @@ if (enable_remoting_host) { script = "//remoting/tools/build/remoting_localize.py" args = [ "--locale_dir", - rebase_path(webapp_locale_dir, root_build_dir), + rebase_path(resources_locale_dir, root_build_dir), "--variables", rebase_path(branding_path, root_build_dir), "--template", @@ -745,9 +736,7 @@ if (enable_me2me_host) { "//remoting/host", "//remoting/proto", "//third_party/libjingle_xmpp", - "//third_party/webrtc/api:scoped_refptr", - "//third_party/webrtc/modules/desktop_capture", - "//third_party/webrtc_overrides:init_webrtc", + "//third_party/webrtc_overrides:webrtc_component", ] if (is_posix) { diff --git a/chromium/remoting/host/chromeos/BUILD.gn b/chromium/remoting/host/chromeos/BUILD.gn index d6ae15d47ee..c6924ba7ae4 100644 --- a/chromium/remoting/host/chromeos/BUILD.gn +++ b/chromium/remoting/host/chromeos/BUILD.gn @@ -27,7 +27,7 @@ source_set("chromeos") { "//ppapi/host", "//remoting/protocol", "//skia", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", "//ui/aura", "//ui/compositor", "//ui/events", diff --git a/chromium/remoting/host/file_transfer/BUILD.gn b/chromium/remoting/host/file_transfer/BUILD.gn index ffaaa0b5b42..06c1395c5e4 100644 --- a/chromium/remoting/host/file_transfer/BUILD.gn +++ b/chromium/remoting/host/file_transfer/BUILD.gn @@ -27,6 +27,10 @@ source_set("file_transfer") { "//remoting/protocol", ] + if (is_mac) { + libs = [ "AppKit.framework" ] + } + if (!is_mac && !is_win) { sources += [ "ensure_user_no_op.cc" ] } diff --git a/chromium/remoting/host/input_monitor/BUILD.gn b/chromium/remoting/host/input_monitor/BUILD.gn index 829366869ad..14d12cd2a43 100644 --- a/chromium/remoting/host/input_monitor/BUILD.gn +++ b/chromium/remoting/host/input_monitor/BUILD.gn @@ -32,17 +32,13 @@ source_set("input_monitor") { deps = [ "//remoting/proto", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", ] if (use_ozone) { deps += [ "//ui/ozone" ] } - if (is_mac) { - deps += [ "//third_party/google_toolbox_for_mac" ] - } - if (!use_x11 || (is_chromeos && !use_ozone)) { sources -= [ "local_hotkey_input_monitor_x11.cc", diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn index 473ce9339d3..9db27513758 100644 --- a/chromium/remoting/host/it2me/BUILD.gn +++ b/chromium/remoting/host/it2me/BUILD.gn @@ -145,8 +145,9 @@ if (!is_chromeos && enable_remoting_host) { if (is_mac) { app_target_type = "mac_app_bundle" - bundle_data("remote_assistance_host_dialog_icon") { + bundle_data("remote_assistance_host_icons") { sources = [ + "//remoting/host/mac/remoting_host.icns", "//remoting/resources/chromoting128.png", ] @@ -220,7 +221,7 @@ if (!is_chromeos && enable_remoting_host) { "//remoting/host", "//remoting/host/native_messaging", "//remoting/proto", - "//third_party/webrtc_overrides:init_webrtc", + "//third_party/webrtc_overrides:webrtc_component", "//ui/gfx", ] if (is_mac) { @@ -231,8 +232,9 @@ if (!is_chromeos && enable_remoting_host) { ] } deps += [ - ":remote_assistance_host_dialog_icon", + ":remote_assistance_host_icons", "//remoting/host:remoting_infoplist_strings", + "//remoting/host/mac:permission_checking", "//remoting/resources:copy_locales", ] if (icu_use_data_file) { diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn index bbfd2825304..88803413ea9 100644 --- a/chromium/remoting/host/linux/BUILD.gn +++ b/chromium/remoting/host/linux/BUILD.gn @@ -94,7 +94,7 @@ source_set("linux") { deps = [ "//remoting/protocol", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", ] public_deps = [] @@ -121,7 +121,7 @@ if (use_x11) { "x_server_clipboard.h", ] deps = [ - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", ] } } diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn index d251ddfa51c..971ec123f24 100644 --- a/chromium/remoting/host/mac/BUILD.gn +++ b/chromium/remoting/host/mac/BUILD.gn @@ -4,6 +4,22 @@ import("//remoting/build/config/remoting_build.gni") +if (icu_use_data_file) { + bundle_data("icu_data") { + sources = [ + "$root_out_dir/icudtl.dat", + ] + + outputs = [ + "{{bundle_resources_dir}}/{{source_file_part}}", + ] + + public_deps = [ + "//third_party/icu:icudata", + ] + } +} + source_set("constants") { defines = [ "HOST_BUNDLE_NAME=\"" + me2me_host_bundle_name + "\"", @@ -20,6 +36,24 @@ source_set("constants") { ] } +source_set("permission_checking") { + sources = [ + "permission_checker.cc", + "permission_checker.h", + "permission_process_utils.cc", + "permission_process_utils.h", + "permission_utils.h", + "permission_utils.mm", + "permission_wizard.h", + "permission_wizard.mm", + ] + + deps = [ + ":constants", + "//remoting/resources", + ] +} + executable("remoting_me2me_host_service") { sources = [ "host_service_main.cc", @@ -63,7 +97,7 @@ foreach(locale, remoting_locales_with_underscores) { bundle_data("remoting_host_resources") { sources = [ "$root_gen_dir/remoting/CREDITS.txt", - "remoting_me2me_host.icns", + "remoting_host.icns", ] outputs = [ @@ -73,11 +107,6 @@ bundle_data("remoting_host_resources") { public_deps = [ "//remoting/host/installer:credits", ] - - if (icu_use_data_file) { - sources += [ "$root_out_dir/icudtl.dat" ] - public_deps += [ "//third_party/icu:icudata" ] - } } target("mac_app_bundle", "remoting_me2me_host") { @@ -95,12 +124,8 @@ target("mac_app_bundle", "remoting_me2me_host") { # defines = [ "REMOTING_ENABLE_BREAKPAD" ] # } - sources = [ - "permission_utils.h", - "permission_utils.mm", - ] - deps = [ + ":permission_checking", "//remoting/base:breakpad", "//remoting/host:main", "//remoting/host:remoting_me2me_host_static", @@ -120,6 +145,10 @@ target("mac_app_bundle", "remoting_me2me_host") { "//remoting/host:remoting_infoplist_strings", "//remoting/resources:copy_locales", ] + + if (icu_use_data_file) { + deps += [ ":icu_data" ] + } } foreach(locale, remoting_locales_with_underscores) { @@ -153,6 +182,8 @@ foreach(locale, remoting_locales_with_underscores) { bundle_data("remoting_native_messaging_host_resources") { sources = [ + "remoting_host.icns", + # This image is used to badge the lock icon in the authentication dialogs, # used for elevating privileges to set up the host. The exact filename is # required by base::mac::GetAuthorizationRightsWithPrompt(). @@ -164,6 +195,12 @@ bundle_data("remoting_native_messaging_host_resources") { outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}", ] + + if (icu_use_data_file) { + deps = [ + ":icu_data", + ] + } } target("mac_app_bundle", "remoting_native_messaging_host") { @@ -175,6 +212,7 @@ target("mac_app_bundle", "remoting_native_messaging_host") { "VERSION_FULL=$remoting_version_full", "VERSION_SHORT=$remoting_version_short", "MACOSX_DEPLOYMENT_TARGET=10.7", + "HOST_NAME=$host_name", ] sources = [ diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn index d698d75eec2..1a56b42f357 100644 --- a/chromium/remoting/host/security_key/BUILD.gn +++ b/chromium/remoting/host/security_key/BUILD.gn @@ -39,7 +39,7 @@ source_set("security_key") { "//mojo/public/cpp/platform", "//mojo/public/cpp/system", "//remoting/proto", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", ] if (is_posix) { @@ -133,6 +133,6 @@ static_library("test_support") { public_deps = [ "//testing/gmock", "//third_party/protobuf:protobuf_lite", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", ] } diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn index 539cfd1353b..bf4035d2410 100644 --- a/chromium/remoting/host/setup/BUILD.gn +++ b/chromium/remoting/host/setup/BUILD.gn @@ -50,6 +50,10 @@ source_set("common") { "//services/network/public/mojom", ] + if (is_mac) { + deps += [ "//remoting/host/mac:permission_checking" ] + } + if (is_mac || is_ios) { deps += [ "//remoting/host/mac:constants" ] } diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn index 2c91a5463a4..e1e6f2a9f09 100644 --- a/chromium/remoting/host/win/BUILD.gn +++ b/chromium/remoting/host/win/BUILD.gn @@ -136,7 +136,7 @@ source_set("win") { "//remoting/protocol", "//remoting/resources", "//services/device/wake_lock/power_save_blocker", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", "//ui/base", "//ui/events:dom_keycode_converter", "//ui/events/platform", @@ -252,7 +252,7 @@ remoting_localize("messages_localizing") { "host_messages.mc.jinja2", ] locales = remoting_locales - locale_dir = webapp_locale_dir + locale_dir = resources_locale_dir encoding = "utf-16" # This target is funny. It only produces one file and the output doesn't @@ -420,7 +420,7 @@ shared_library("remoting_core") { "//remoting/protocol", "//sandbox/win:sandbox", # Should always use Windows version "//services/network/public/mojom", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", ] ldflags = [ @@ -513,7 +513,7 @@ remoting_localize("remoting_windows_resources") { output = "$root_gen_dir/remoting/{{source_name_part}}" - locale_dir = webapp_locale_dir + locale_dir = resources_locale_dir encoding = "utf-16" diff --git a/chromium/remoting/ios/BUILD.gn b/chromium/remoting/ios/BUILD.gn index 0d8fc28dbe2..2dceb627797 100644 --- a/chromium/remoting/ios/BUILD.gn +++ b/chromium/remoting/ios/BUILD.gn @@ -34,8 +34,7 @@ source_set("ios_core") { "//remoting/ios/domain", "//remoting/ios/facade", "//remoting/ios/session", - "//third_party/webrtc/modules/desktop_capture:primitives", - "//third_party/webrtc/rtc_base:rtc_base", + "//third_party/webrtc_overrides:webrtc_component", ] deps = [ diff --git a/chromium/remoting/ios/app/resources/BUILD.gn b/chromium/remoting/ios/app/resources/BUILD.gn index b1e7137ceb2..31e04307fcc 100644 --- a/chromium/remoting/ios/app/resources/BUILD.gn +++ b/chromium/remoting/ios/app/resources/BUILD.gn @@ -96,7 +96,7 @@ action("infoplist_strings") { script = "//remoting/tools/build/remoting_localize.py" args = [ "--locale_dir", - rebase_path(webapp_locale_dir, root_build_dir), + rebase_path(resources_locale_dir, root_build_dir), "--variables", rebase_path(branding_path, root_build_dir), "--template", diff --git a/chromium/remoting/ios/display/BUILD.gn b/chromium/remoting/ios/display/BUILD.gn index 183669b8c51..9180fd9c6ff 100644 --- a/chromium/remoting/ios/display/BUILD.gn +++ b/chromium/remoting/ios/display/BUILD.gn @@ -29,7 +29,7 @@ source_set("display") { public_deps = [ "//remoting/client", "//third_party/protobuf:protobuf_lite", - "//third_party/webrtc/rtc_base:rtc_base_approved", + "//third_party/webrtc_overrides:webrtc_component", ] deps = [ diff --git a/chromium/remoting/proto/BUILD.gn b/chromium/remoting/proto/BUILD.gn index 07891d167bb..b905e5cbc73 100644 --- a/chromium/remoting/proto/BUILD.gn +++ b/chromium/remoting/proto/BUILD.gn @@ -19,6 +19,7 @@ proto_library("proto") { "event.proto", "file_transfer.proto", "internal.proto", + "layout_key_function.proto", "mux.proto", "process_stats.proto", "test_data_channel_manager.proto", diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn index b3ccc9d5245..9e9897579f4 100644 --- a/chromium/remoting/protocol/BUILD.gn +++ b/chromium/remoting/protocol/BUILD.gn @@ -189,7 +189,7 @@ static_library("protocol") { public_deps = [ "//remoting/proto", - "//third_party/webrtc_overrides", + "//third_party/webrtc_overrides:webrtc_component", ] deps = [ "//base", @@ -258,16 +258,7 @@ static_library("protocol") { deps += [ "//remoting/proto/remoting/v1:network_traversal_grpc_library", - "//third_party/webrtc/api:callfactory_api", - "//third_party/webrtc/api:packet_socket_factory", - "//third_party/webrtc/api/audio_codecs:audio_codecs_api", - "//third_party/webrtc/api/audio_codecs/opus:audio_decoder_opus", - "//third_party/webrtc/api/audio_codecs/opus:audio_encoder_opus", - "//third_party/webrtc/api/rtc_event_log:rtc_event_log_factory", - "//third_party/webrtc/api/video_codecs:builtin_video_decoder_factory", - "//third_party/webrtc/media:rtc_audio_video", - "//third_party/webrtc_overrides:init_webrtc", - "//third_party/webrtc_overrides:task_queue_factory", + "//third_party/webrtc_overrides:webrtc_component", ] } diff --git a/chromium/remoting/remoting_locales.gni b/chromium/remoting/remoting_locales.gni index 2a2c6c15662..0f6925568bc 100644 --- a/chromium/remoting/remoting_locales.gni +++ b/chromium/remoting/remoting_locales.gni @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -webapp_locale_dir = "$root_gen_dir/remoting/webapp/_locales" +resources_locale_dir = "$root_gen_dir/remoting/resources/_locales" # See also remoting_locales_with_underscores below. remoting_locales = [ @@ -168,7 +168,7 @@ remoting_android_locales = [ ] # The list of .json files generated by remoting_strings.grd. -remoting_webapp_locale_files = +remoting_resources_locale_files = process_file_template( messages_locales, - [ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ]) + [ "remoting/resources/_locales/{{source_name_part}}/messages.json" ]) diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn index cf5d4cdee28..56d2afa25db 100644 --- a/chromium/remoting/resources/BUILD.gn +++ b/chromium/remoting/resources/BUILD.gn @@ -17,29 +17,16 @@ group("resources") { ] } -# TODO(GYP) enable verify_resources. The bots are complaining about -# gen/main.html not being found but this doesn't seems to reproduce locally. - action("verify_resources") { script = "//remoting/tools/verify_resources.py" sources_to_verify = [ - # "$root_gen_dir/main.html", "../host/continue_window_mac.mm", "../host/disconnect_window_mac.mm", "../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2", "../host/win/core.rc.jinja2", "../host/win/host_messages.mc.jinja2", "../host/win/version.rc.jinja2", - "../webapp/crd/js/background.js", - "../webapp/base/js/error.js", - "../webapp/crd/js/host_list.js", - "../webapp/crd/js/host_setup_dialog.js", - "../webapp/crd/js/host_table_entry.js", - "../webapp/crd/manifest.json.jinja2", - "../webapp/crd/js/paired_client_manager.js", - "../webapp/crd/js/desktop_remoting.js", - "../webapp/crd/js/window_frame.js", ] inputs = [ "remoting_strings.grd" ] + sources_to_verify @@ -55,10 +42,6 @@ action("verify_resources") { "-r", rebase_path("remoting_strings.grd", root_build_dir), ] + rebase_path(sources_to_verify, root_build_dir) - - deps = [ - # "//remoting/webapp:webapp", - ] # Generates main.html. } if (is_android) { @@ -87,7 +70,7 @@ grit("strings") { process_file_template(remoting_locales, [ "remoting/resources/{{source_name_part}}.pak" ]) - outputs += remoting_webapp_locale_files + outputs += remoting_resources_locale_files if (is_android) { outputs += android_string_outputs diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn index 2e0d4e0a7c3..f78337da05d 100644 --- a/chromium/remoting/signaling/BUILD.gn +++ b/chromium/remoting/signaling/BUILD.gn @@ -27,8 +27,6 @@ static_library("signaling") { "message_tracker.cc", "message_tracker.h", "messaging_client.h", - "push_notification_subscriber.cc", - "push_notification_subscriber.h", "registration_manager.h", "remoting_log_to_server.cc", "remoting_log_to_server.h", @@ -55,7 +53,7 @@ static_library("signaling") { "//remoting/proto/ftl/v1:ftl_grpc_library", "//remoting/proto/remoting/v1:telemetry_grpc_library", "//third_party/libjingle_xmpp", - "//third_party/webrtc_overrides", + "//third_party/webrtc_overrides:webrtc_component", ] deps = [ @@ -129,7 +127,6 @@ source_set("unit_tests") { "ftl_signal_strategy_unittest.cc", "iq_sender_unittest.cc", "message_tracker_unittest.cc", - "push_notification_subscriber_unittest.cc", "remoting_log_to_server_unittest.cc", "server_log_entry_unittest.cc", "server_log_entry_unittest.h", diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn index ce64ae84aab..b54191ab3f9 100644 --- a/chromium/remoting/test/BUILD.gn +++ b/chromium/remoting/test/BUILD.gn @@ -8,22 +8,10 @@ static_library("test_support") { testonly = true sources = [ - "access_token_fetcher.cc", - "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", - "connection_time_observer.h", "cyclic_frame_generator.cc", "cyclic_frame_generator.h", - "fake_access_token_fetcher.cc", - "fake_access_token_fetcher.h", - "fake_host_list_fetcher.cc", - "fake_host_list_fetcher.h", "fake_ice_connection.cc", "fake_ice_connection.h", "fake_network_dispatcher.cc", @@ -40,29 +28,17 @@ static_library("test_support") { "fake_webrtc_connection.h", "frame_generator_util.cc", "frame_generator_util.h", - "host_info.cc", - "host_info.h", - "host_list_fetcher.cc", - "host_list_fetcher.h", - "mock_access_token_fetcher.cc", - "mock_access_token_fetcher.h", "remote_connection_observer.h", - "remote_host_info.cc", - "remote_host_info.h", "rgb_value.cc", "rgb_value.h", "scroll_frame_generator.cc", "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", - "test_video_renderer.h", "video_frame_writer.cc", "video_frame_writer.h", ] @@ -79,7 +55,7 @@ static_library("test_support") { "//remoting/protocol", "//remoting/signaling", "//services/network:test_support", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", "//ui/gfx", ] @@ -92,26 +68,7 @@ static_library("test_support") { "//skia", "//testing/gmock", "//testing/gtest", - "//third_party/webrtc/api:packet_socket_factory", - "//third_party/webrtc_overrides", - ] -} - -executable("chromoting_test_driver") { - testonly = true - - sources = [ - "chromoting_test_driver.cc", - "chromoting_test_driver_tests.cc", - "chromoting_test_fixture.cc", - "chromoting_test_fixture.h", - ] - - deps = [ - ":test_support", - "//base/test:test_support", - "//build/win:default_exe_manifest", - "//testing/gtest", + "//third_party/webrtc_overrides:webrtc_component", ] } @@ -161,7 +118,7 @@ if (enable_remoting_host && !is_android && !is_chromeos) { deps = [ ":fake_connection_event_logger", "//base/test:test_support", - "//third_party/webrtc/modules/desktop_capture", + "//third_party/webrtc_overrides:webrtc_component", ] public_deps = [ @@ -242,27 +199,3 @@ executable("ftl_signaling_playground") { "//remoting/signaling", ] } - -source_set("unit_tests") { - testonly = true - - sources = [ - "access_token_fetcher_unittest.cc", - "chromoting_test_driver_environment_unittest.cc", - "connection_time_observer_unittest.cc", - "host_list_fetcher_unittest.cc", - "test_chromoting_client_unittest.cc", - "test_video_renderer_unittest.cc", - ] - - deps = [ - ":test_support", - "//base", - "//net:test_support", - "//services/network:test_support", - "//testing/gmock", - "//testing/gtest", - "//third_party/libyuv", - "//third_party/webrtc/modules/desktop_capture", - ] -} diff --git a/chromium/remoting/tools/BUILD.gn b/chromium/remoting/tools/BUILD.gn index 14c3ff46ef9..b0d72bebfdf 100644 --- a/chromium/remoting/tools/BUILD.gn +++ b/chromium/remoting/tools/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//components/nacl/features.gni") import("//remoting/build/config/remoting_build.gni") group("all_tests") { @@ -17,10 +16,6 @@ group("all") { if (is_win) { deps += [ ":remoting_breakpad_tester" ] } - - if (enable_nacl) { - deps += [ "//remoting/tools/javascript_key_tester" ] - } } if (is_win) { diff --git a/chromium/remoting/tools/javascript_key_tester/BUILD.gn b/chromium/remoting/tools/javascript_key_tester/BUILD.gn deleted file mode 100644 index 02bd63d7bc5..00000000000 --- a/chromium/remoting/tools/javascript_key_tester/BUILD.gn +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2015 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("//components/nacl/features.gni") - -assert(enable_nacl) - -group("javascript_key_tester") { - deps = [ - ":javascript_key_tester_copies", - ] -} - -copy("javascript_key_tester_copies") { - pexe_dir = get_label_info( - "pnacl:remoting_key_tester_newlib(//build/toolchain/nacl:newlib_pnacl)", - "root_out_dir") - - sources = [ - "$pexe_dir/remoting_key_tester_newlib.pexe", - "background.js", - "chord_tracker.js", - "event_listeners.js", - "icon_128.png", - "main.css", - "main.html", - "main.js", - "manifest.json", - "pnacl/remoting_key_tester.nmf", - ] - - outputs = [ - "$target_out_dir/remoting/key_tester/{{source_file_part}}", - ] - - deps = [ - ":javascript_key_tester_jscompile", - "pnacl:remoting_key_tester_newlib(//build/toolchain/nacl:newlib_pnacl)", - ] -} - -group("javascript_key_tester_jscompile") { - # TODO(GYP): crbug.com/471926 add support for run_jscompile=true. - run_jscompile = false - if (run_jscompile) { - } -} diff --git a/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn b/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn deleted file mode 100644 index 90d9565b3e8..00000000000 --- a/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2015 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. - -assert(is_nacl, - "These targets must only be built using the untrusted NaCl toolchains.") - -executable("remoting_key_tester_newlib") { - sources = [ - "remoting_key_tester.cc", - ] - - deps = [ - "//ppapi/cpp", - "//ppapi/native_client:ppapi_lib", - ] -} diff --git a/chromium/remoting/webapp/BUILD.gn b/chromium/remoting/webapp/BUILD.gn deleted file mode 100644 index 66cd297733b..00000000000 --- a/chromium/remoting/webapp/BUILD.gn +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 2014 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. - -# Keep in sync with targets in remoting/remoting_client.gypi. - -import("//build/config/features.gni") -import("//remoting/webapp/build_template.gni") -import("//remoting/webapp/files.gni") - -action("credits") { - about_credits_file = "$target_gen_dir/credits.html" - script = "//tools/licenses.py" - depfile = "$target_gen_dir/$target_name.d" - - inputs = [ - "base/html/credits.tmpl", - "base/html/credits_entry.tmpl", - ] - - outputs = [ - about_credits_file, - ] - - args = [ - "credits", - rebase_path(about_credits_file, root_build_dir), - "--file-template", - rebase_path("base/html/credits.tmpl", root_build_dir), - "--entry-template", - rebase_path("base/html/credits_entry.tmpl", root_build_dir), - "--depfile", - rebase_path(depfile, root_build_dir), - ] -} - -desktop_remoting_webapp("webapp") { - output_dir = "$root_build_dir/remoting/remoting-webapp.v2" - zip_path = "$root_build_dir/remoting-webapp.v2.zip" - extra_files = [] -} - -copy("browser_test_resources") { - sources = remoting_webapp_browsertest_main_html_extra_files - outputs = [ - "$root_out_dir/remoting/browser_test_resources/{{source_file_part}}", - ] -} - -remoting_unit_test_out_dir = "$root_out_dir/remoting/unittests" - -group("unit_tests") { - data_deps = [ - ":blanketjs", - ":unittest_html", - ":js_files", - ":qunit", - ":sinonjs", - ] -} - -copy("js_files") { - sources = webapp_js_files + remoting_webapp_unittests_all_files - outputs = [ - "$remoting_unit_test_out_dir/{{source_file_part}}", - ] -} - -copy("blanketjs") { - sources = [ - "//third_party/blanketjs/src/blanket.js", - "//third_party/blanketjs/src/qunit_adapter.js", - ] - outputs = [ - "$remoting_unit_test_out_dir/blanketjs/{{source_file_part}}", - ] -} - -copy("sinonjs") { - sources = [ - "//third_party/sinonjs/src/sinon-qunit.js", - "//third_party/sinonjs/src/sinon.js", - ] - outputs = [ - "$remoting_unit_test_out_dir/sinonjs/{{source_file_part}}", - ] -} - -copy("qunit") { - sources = [ - "//third_party/qunit/src/browser_test_harness.js", - "//third_party/qunit/src/qunit.css", - "//third_party/qunit/src/qunit.js", - ] - outputs = [ - "$remoting_unit_test_out_dir/qunit/{{source_file_part}}", - ] -} - -build_webapp_html("unittest_html") { - html_template_file = remoting_webapp_unittests_template_main - html_template_include_files = [] - js_files = remoting_webapp_unittests_all_js_files - html_output = "$remoting_unit_test_out_dir/unittests.html" - exclude_js = remoting_webapp_unittests_exclude_js_files - instrument_js = webapp_js_files -} diff --git a/chromium/remoting/webapp/build_template.gni b/chromium/remoting/webapp/build_template.gni deleted file mode 100644 index 1638c05463e..00000000000 --- a/chromium/remoting/webapp/build_template.gni +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 2015 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. - -# Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi. - -import("//build/config/chrome_build.gni") -import("//build/config/features.gni") -import("//build/util/version.gni") -import("//components/nacl/features.gni") -import("//remoting/remoting_enable.gni") -import("//remoting/remoting_locales.gni") -import("//remoting/remoting_options.gni") -import("//remoting/remoting_version.gni") -import("//remoting/webapp/files.gni") -import("//third_party/closure_compiler/closure_args.gni") - -# The base remoting directory that is used as the root directory for file -# references. Many of the scripts rely on the files being specified relative -# to this directory. -remoting_dir = "//remoting" - -buildtype = "Dev" -if (!is_debug) { - if (is_official_build) { - buildtype = "Official" - } else { - buildtype = "Release" - } -} - -template("build_locales_listfile") { - action(target_name) { - locales_listfile_output = invoker.locales_listfile_output - - script = "../tools/build/remoting_localize.py" - - inputs = [] - outputs = [ - locales_listfile_output, - ] - - args = [ - "--locale_output", - rebase_path(webapp_locale_dir, root_build_dir) + - "/@{json_suffix}/messages.json", - "--locales_listfile", - rebase_path(locales_listfile_output, root_build_dir), - ] - args += remoting_locales - } -} - -template("build_webapp_html") { - target_jscompile = "" - - # Do not enable JSCompile on instrumented builds. - if (enable_remoting_jscompile && invoker.instrument_js == []) { - target_jscompile = "${target_name}_jscompile" - target_jscompile_stamp = "$target_gen_dir/${target_jscompile}.stamp" - action(target_jscompile) { - js_files = remoting_webapp_js_proto_files + invoker.js_files - externs = - remoting_webapp_js_externs_files + [ - "../../third_party/closure_compiler/externs/chrome_extensions.js", - "../../third_party/closure_compiler/externs/metrics_private.js", - ] - - script = "../../third_party/closure_compiler/compile.py" - inputs = js_files - outputs = [ - target_jscompile_stamp, - ] - - extra_closure_args = [ - "jscomp_error=reportUnknownTypes", - "jscomp_error=duplicate", - "jscomp_error=misplacedTypeAnnotation", - ] - - args = rebase_path(js_files, root_build_dir) - args += [ - "--no_single_file", - "--out_file", - rebase_path(target_jscompile_stamp, root_build_dir), - "--closure_args", - ] + default_closure_args + extra_closure_args - args += [ "--externs" ] + rebase_path(externs, root_build_dir) - } - } - - action(target_name) { - html_template_file = invoker.html_template_file - html_template_include_files = invoker.html_template_include_files - js_files = invoker.js_files - html_output = invoker.html_output - exclude_js = invoker.exclude_js - instrument_js = invoker.instrument_js - - script = "//remoting/webapp/build-html.py" - - # Create a file that contains a list of all the JavaScript files needed - # to build the unit test page. This is needed to avoid problems on platforms - # that limit the size of a command line. - file_list = "$target_gen_dir/${target_name}_files.txt" - files = rebase_path(js_files, root_build_dir) - write_file(file_list, files) - - inputs = [ html_template_file ] + html_template_include_files + js_files - - outputs = [ - html_output, - ] - - if (target_jscompile != "") { - deps = [ - ":$target_jscompile", - ] - } - - args = [ - rebase_path(html_output, root_build_dir), - rebase_path(html_template_file, root_build_dir), - ] - args += [ - "--template-dir", - rebase_path(remoting_dir, root_build_dir), - ] - args += [ "--templates" ] + html_template_include_files - args += [ - "--js-list-file", - rebase_path(file_list, root_build_dir), - ] - args += [ "--templates" ] + html_template_include_files - args += [ - "--js-list-file", - rebase_path(file_list, root_build_dir), - ] - args += [ "--exclude-js" ] + rebase_path(exclude_js, root_build_dir) - args += [ "--instrument-js" ] + rebase_path(instrument_js, root_build_dir) - } -} - -template("desktop_remoting_webapp") { - locales_listfile = target_name + "_locales" - locales_listfile_output = "$target_gen_dir/${target_name}_locales.txt" - - build_locales_listfile(locales_listfile) { - # Template uses locales_listfile_output from outer scope. - } - - background_html = target_name + "_background_html" - background_html_output = "$target_gen_dir/html/$target_name/background.html" - - build_webapp_html(background_html) { - html_template_file = remoting_webapp_template_background - html_template_include_files = [] - js_files = remoting_webapp_background_html_all_js_files - html_output = background_html_output - exclude_js = [] - instrument_js = [] - } - - message_window_html = target_name + "_message_window_html" - message_window_html_output = - "$target_gen_dir/html/$target_name/message_window.html" - - build_webapp_html(message_window_html) { - html_template_file = remoting_webapp_template_message_window - html_template_include_files = [] - js_files = remoting_webapp_message_window_html_all_js_files - html_output = message_window_html_output - exclude_js = [] - instrument_js = [] - } - - wcs_sandbox_html = target_name + "_wcs_sandbox_html" - wcs_sandbox_html_output = "$target_gen_dir/html/$target_name/wcs_sandbox.html" - - build_webapp_html(wcs_sandbox_html) { - html_template_file = remoting_webapp_template_wcs_sandbox - html_template_include_files = [] - js_files = remoting_webapp_wcs_sandbox_html_all_js_files - html_output = wcs_sandbox_html_output - exclude_js = [] - instrument_js = [] - } - - main_html = target_name + "_main_html" - main_html_output = "$target_gen_dir/html/$target_name/main.html" - - build_webapp_html(main_html) { - html_template_file = remoting_webapp_template_main - html_template_include_files = remoting_webapp_template_files - js_files = remoting_webapp_crd_main_html_all_js_files - html_output = main_html_output - exclude_js = [] - instrument_js = [] - } - - public_session_html = target_name + "_public_session_html" - public_session_html_output = - "$target_gen_dir/html/$target_name/public_session.html" - - build_webapp_html(public_session_html) { - html_template_file = remoting_webapp_template_public_session - html_template_include_files = remoting_webapp_public_session_template_files - js_files = remoting_webapp_public_session_html_all_js_files - html_output = public_session_html_output - exclude_js = [] - instrument_js = [] - } - - action(target_name) { - script = "//remoting/webapp/build-webapp.py" - - sources = [ - "//build/android/gyp/util/build_utils.py", - ] - - output_dir = invoker.output_dir - zip_path = invoker.zip_path - extra_files = invoker.extra_files - - dr_generated_html_files = [ - background_html_output, - message_window_html_output, - wcs_sandbox_html_output, - main_html_output, - public_session_html_output, - "$target_gen_dir/credits.html", - ] - - inputs = [ rebase_path("crd/manifest.json.jinja2") ] + - remoting_version_files + rebase_path(remoting_webapp_crd_files) + - extra_files + dr_generated_html_files - - outputs = [ - zip_path, - ] - - deps = [ - ":$background_html", - ":$locales_listfile", - ":$main_html", - ":$message_window_html", - ":$public_session_html", - ":$wcs_sandbox_html", - "//remoting/resources", - "//remoting/webapp:credits", - ] - - # Create a file that contains a list of all the resource files needed - # to build the webapp. This is needed to avoid problems on platforms that - # limit the size of a command line. - file_list = "$target_gen_dir/${target_name}_files.txt" - files = [] - files += rebase_path(dr_generated_html_files, root_build_dir) - files += rebase_path(remoting_webapp_crd_files, root_build_dir) - files += rebase_path(extra_files, root_build_dir) - write_file(file_list, files) - - args = [ - buildtype, - chrome_version_full, - rebase_path(output_dir, root_build_dir), - rebase_path(zip_path, root_build_dir), - rebase_path("crd/manifest.json.jinja2", root_build_dir), - ] - args += [ - "--files_listfile", - rebase_path(file_list, root_build_dir), - ] - args += [ - "--locales_listfile", - rebase_path(locales_listfile_output, root_build_dir), - ] - args += [ - "--use_gcd", - "$remoting_use_gcd", - ] - } -} diff --git a/chromium/remoting/webapp/files.gni b/chromium/remoting/webapp/files.gni deleted file mode 100644 index 1dd5e78c91f..00000000000 --- a/chromium/remoting/webapp/files.gni +++ /dev/null @@ -1,567 +0,0 @@ -# Copyright 2015 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. - -# Please keep this file in sync with remoting/remoting_webapp_files.gypi . - -# JSCompiler externs. -remoting_webapp_js_externs_files = [ "externs/qunit.js" ] - -# Jscompile proto files. -# These provide type information for jscompile. -remoting_webapp_js_proto_files = [ - "js_proto/chrome_proto.js", - "js_proto/dom_proto.js", - "js_proto/remoting_proto.js", -] - -# -# Webapp browsertest JavaScript files. -# - -# Browser test files. -remoting_webapp_browsertest_js_files = [ - "browser_test/browser_test.js", - "browser_test/bump_scroll_browser_test.js", - "browser_test/cancel_pin_browser_test.js", - "browser_test/invalid_pin_browser_test.js", - "browser_test/it2me_browser_test.js", - "browser_test/me2me_browser_test.js", - "browser_test/scrollbar_browser_test.js", - "browser_test/timeout_waiter.js", - "browser_test/unauthenticated_browser_test.js", - "browser_test/update_pin_browser_test.js", -] - -# Browser test files. -remoting_webapp_browsertest_js_mock_files = [ - "crd/js/mock_client_plugin.js", - "crd/js/mock_host_list_api.js", - "crd/js/mock_identity.js", - "crd/js/mock_oauth2_api.js", - "crd/js/mock_signal_strategy.js", -] -remoting_webapp_browsertest_js_proto_files = [ - "js_proto/sinon_proto.js", - "js_proto/test_proto.js", - ] + remoting_webapp_js_proto_files - -remoting_webapp_browsertest_all_js_files = - remoting_webapp_browsertest_js_files + - remoting_webapp_browsertest_js_mock_files - -remoting_webapp_browsertest_main_html_extra_files = - remoting_webapp_browsertest_all_js_files + - [ "//third_party/sinonjs/src/sinon.js" ] - -# -# Webapp unittest JavaScript files. -# - -# These product files are excluded from our JavaScript unittest -remoting_webapp_unittests_exclude_js_files = [ - # background.js is where the onLoad handler is defined, which - # makes it the entry point of the background page. - "crd/js/background.js", -] - -# The unit test cases for the webapp -remoting_webapp_unittests_js_files = [ - "base/js/base_unittest.js", - "base/js/base_event_hook_unittest.js", - "base/js/base_inherits_unittest.js", - "base/js/callstack_unittest.js", - "base/js/client_session_unittest.js", - "base/js/client_session_factory_unittest.js", - "base/js/console_wrapper_unittest.js", - "base/js/dns_blackhole_checker_unittest.js", - "base/js/error_unittest.js", - "base/js/fallback_signal_strategy_unittest.js", - "base/js/host_options_unittest.js", - "base/js/identity_unittest.js", - "base/js/ipc_unittest.js", - "base/js/l10n_unittest.js", - "base/js/network_connectivity_detector_unittest.js", - "base/js/platform_unittest.js", - "base/js/protocol_extension_manager_unittest.js", - "base/js/session_logger_unittest.js", - "base/js/telemetry_event_writer_unittest.js", - "base/js/typecheck_unittest.js", - "base/js/viewport_unittest.js", - "base/js/window_shape_unittest.js", - "base/js/window_message_dispatcher_unittest.js", - "base/js/xhr_event_writer_unittest.js", - "base/js/xhr_unittest.js", - "base/js/xmpp_connection_unittest.js", - "base/js/xmpp_error_cache_unittest.js", - "base/js/xmpp_login_handler_unittest.js", - "base/js/xmpp_stream_parser_unittest.js", - "crd/js/apps_v2_migration_unittest.js", - "crd/js/combined_host_list_api_unittest.js", - "crd/js/gcd_client_unittest.js", - "crd/js/gcd_client_with_mock_xhr_unittest.js", - "crd/js/gnubby_auth_handler_unittest.js", - "crd/js/host_controller_unittest.js", - "crd/js/host_daemon_facade_unittest.js", - "crd/js/host_table_entry_unittest.js", - "crd/js/legacy_host_list_api_unittest.js", - "crd/js/menu_button_unittest.js", - "crd/js/mock_xhr_unittest.js", -] -remoting_webapp_unittests_js_mock_files = [ - "crd/js/mock_client_plugin.js", - "crd/js/mock_host_daemon_facade.js", - "crd/js/mock_host_list_api.js", - "crd/js/mock_identity.js", - "crd/js/mock_signal_strategy.js", - "js_proto/chrome_mocks.js", - "unittests/sinon_helpers.js", - "crd/js/mock_xhr.js", -] - -# Prototypes for objects that are not mocked. -remoting_webapp_unittests_js_proto_files = [ - "js_proto/chrome_proto.js", - "js_proto/dom_proto.js", - "js_proto/remoting_proto.js", - "js_proto/sinon_proto.js", -] -remoting_webapp_unittests_all_js_files = - remoting_webapp_unittests_js_files + - remoting_webapp_unittests_js_mock_files + [ "unittests/qunit_callbacks.js" ] - -# All the files needed to run the unittests. -remoting_webapp_unittests_all_files = - [ "crd/html/menu_button.css" ] + remoting_webapp_unittests_all_js_files -remoting_webapp_unittests_template_main = "crd/html/template_unittests.html" - -# -# Shared webapp JavaScript file groups. -# - -# Auth (Google account) JavaScript files. -remoting_webapp_shared_js_auth_google_files = [ - "base/js/auth_init.js", - "base/js/identity.js", - "base/js/oauth2.js", - "base/js/oauth2_api.js", - "base/js/oauth2_api_impl.js", -] - -# Client JavaScript files. -remoting_webapp_shared_js_client_files = [ - "base/js/activity.js", - "base/js/client_plugin.js", - "base/js/client_plugin_host_desktop_impl.js", - "base/js/client_plugin_impl.js", - "base/js/client_session.js", - "base/js/client_session_factory.js", - "base/js/clipboard.js", - "base/js/connected_view.js", - "base/js/connection_info.js", - "base/js/credentials_provider.js", - "base/js/experiments.js", - "base/js/host_desktop.js", - "base/js/telemetry_event_writer.js", - "base/js/xmpp_error_cache.js", -] - -# Remoting core JavaScript files. -remoting_webapp_shared_js_core_files = [ - "base/js/application.js", - "base/js/base.js", - "base/js/callstack.js", - "base/js/chromoting_event.js", - "base/js/console_wrapper.js", - "base/js/ipc.js", - "base/js/modal_dialogs.js", - "base/js/platform.js", - "base/js/protocol_extension_manager.js", - "base/js/protocol_extension.js", - "base/js/error.js", - "base/js/network_connectivity_detector.js", - "base/js/plugin_settings.js", - "base/js/suspend_detector.js", - "base/js/typecheck.js", - "base/js/window_message_dispatcher.js", - "base/js/xhr.js", - "base/js/xhr_event_writer.js", -] - -# Host JavaScript files. -remoting_webapp_shared_js_host_files = [ - "base/js/host.js", - "base/js/host_options.js", -] - -# Logging and stats JavaScript files. -remoting_webapp_shared_js_logging_files = [ - "base/js/format_iq.js", - "base/js/session_logger.js", -] - -# Remoting signaling files. -remoting_webapp_shared_js_signaling_files = [ - "base/js/dns_blackhole_checker.js", - "base/js/fallback_signal_strategy.js", - "base/js/signal_strategy.js", - "base/js/tcp_socket.js", - "base/js/wcs_adapter.js", - "base/js/wcs_sandbox_container.js", - "base/js/xmpp_connection.js", - "base/js/xmpp_login_handler.js", - "base/js/xmpp_stream_parser.js", -] - -# UI JavaScript files. -remoting_webapp_shared_js_ui_files = [ - "base/js/connection_dropped_dialog.js", - "base/js/connection_stats.js", - "base/js/l10n.js", - "base/js/ui_mode.js", - "base/js/viewport.js", - "base/js/window_shape.js", -] - -# -# DesktopRemoting webapp JavaScript file groups. -# - -# Auth (apps v1) JavaScript files. -# These files aren"t included directly from main.html. They are -# referenced from the manifest.json file (appsv1 only). -remoting_webapp_js_auth_v1_files = [ - "crd/js/cs_third_party_auth_trampoline.js", # client to host - "crd/js/cs_oauth2_trampoline.js", # Google account -] - -# Auth (client to host) JavaScript files. -remoting_webapp_js_auth_client2host_files = [ - "crd/js/third_party_host_permissions.js", - "crd/js/third_party_token_fetcher.js", -] - -# Client JavaScript files. -remoting_webapp_js_client_files = [ - "crd/js/apps_v2_migration.js", - "crd/js/event_handlers.js", - "crd/js/gcd_client.js", -] - -# Gnubby authentication JavaScript files. -remoting_webapp_js_gnubby_auth_files = [ "crd/js/gnubby_auth_handler.js" ] - -# Files for controlling the local machine as a host. -# Includes both it2me and me2me files. -remoting_webapp_js_host_control_files = [ - "crd/js/host_controller.js", - "crd/js/host_daemon_facade.js", - "crd/js/host_screen.js", - "crd/js/host_session.js", - "crd/js/host_setup_dialog.js", - "crd/js/host_install_dialog.js", - "crd/js/host_installer.js", - "crd/js/it2me_host_facade.js", - "crd/js/native_message_host_log_message_handler.js", - "crd/js/paired_client_manager.js", -] - -# Files for controlling the local it2me host. -# Included by public_session.html. -remoting_webapp_js_it2me_host_control_files = [ - "crd/js/host_screen.js", - "crd/js/host_session.js", - "crd/js/host_install_dialog.js", - "crd/js/host_installer.js", - "crd/js/it2me_host_facade.js", - "crd/js/native_message_host_log_message_handler.js", -] - -# Files for displaying (in the client) info about available hosts. -remoting_webapp_js_host_display_files = [ - "crd/js/host_list.js", - "crd/js/host_list_api.js", - "crd/js/host_table_entry.js", - "crd/js/local_host_section.js", - - # Must come after host_list_api.js because of an issue with - # JSCompiler. If an implementation of an interface occurs in a - # file processed before the interface itself, the @override tag - # doesn't always work correctly. - "crd/js/combined_host_list_api.js", - "crd/js/gcd_host_list_api.js", - "crd/js/legacy_host_list_api.js", -] - -# The CRD-specific JavaScript files required by main.html. -remoting_webapp_crd_js_ui_files = [ - "crd/js/bump_scroller.js", - "crd/js/crd_auth_dialog.js", - "crd/js/crd_event_handlers.js", - "crd/js/crd_experimental.js", - "crd/js/desktop_connected_view.js", - "crd/js/desktop_remoting.js", - "crd/js/desktop_remoting_activity.js", - "crd/js/desktop_viewport.js", - "crd/js/feedback.js", - "crd/js/fullscreen.js", - "crd/js/fullscreen_v1.js", - "crd/js/fullscreen_v2.js", - "crd/js/it2me_activity.js", - "crd/js/me2me_activity.js", - "crd/js/menu_button.js", - "crd/js/options_menu.js", - "crd/js/toolbar.js", - "crd/js/window_frame.js", -] - -# -# DesktopRemoting main.html generation files. -# - -remoting_webapp_template_main = "crd/html/template_main.html" - -# The shared JavaScript files required by main.html. -remoting_webapp_shared_main_html_js_files = - # Include the core files first as it is required by the other files. - # Otherwise, Jscompile will complain. - remoting_webapp_shared_js_core_files + - remoting_webapp_shared_js_auth_google_files + - remoting_webapp_shared_js_client_files + - remoting_webapp_shared_js_host_files + - remoting_webapp_shared_js_logging_files + - remoting_webapp_shared_js_ui_files + - remoting_webapp_shared_js_signaling_files + - remoting_webapp_js_auth_client2host_files + - remoting_webapp_js_client_files + remoting_webapp_js_gnubby_auth_files + - remoting_webapp_js_host_control_files + - remoting_webapp_js_host_display_files - -# Uncomment this line to include browser test files in the web app -# to expedite debugging or local development. -#+ remoting_webapp_browsertest_all_js_files - -remoting_webapp_unittest_html_all_js_files = - remoting_webapp_shared_main_html_js_files + remoting_webapp_crd_js_ui_files - -# The CRD-specific JavaScript files required by main.html. -remoting_webapp_crd_main_html_all_js_files = - remoting_webapp_shared_main_html_js_files + - remoting_webapp_crd_js_ui_files + [ "crd/js/crd_main.js" ] - -# These template files are used to construct main.html. -remoting_webapp_template_files = [ - "base/html/client_plugin.html", - "crd/html/butter_bar.html", - "crd/html/dialog_auth.html", - "crd/html/dialog_client_connect_failed.html", - "crd/html/dialog_client_connecting.html", - "crd/html/dialog_client_host_needs_upgrade.html", - "crd/html/dialog_client_pin_prompt.html", - "crd/html/dialog_client_session_finished.html", - "crd/html/dialog_client_third_party_auth.html", - "crd/html/dialog_client_unconnected.html", - "crd/html/dialog_confirm_host_delete.html", - "crd/html/dialog_connection_history.html", - "crd/html/dialog_host.html", - "crd/html/dialog_host_install.html", - "crd/html/dialog_host_setup.html", - "crd/html/dialog_manage_pairings.html", - "crd/html/dialog_token_refresh_failed.html", - "crd/html/toolbar.html", - "crd/html/ui_header.html", - "crd/html/ui_it2me.html", - "crd/html/ui_me2me.html", - "crd/html/window_frame.html", -] - -# -# DesktopRemoting public_session.html generation files. -# -remoting_webapp_template_public_session = - "crd/html/template_public_session.html" - -# The shared JavaScript files required by public_session.html. -remoting_webapp_public_session_html_all_js_files = - # Include the core files first as it is required by the other files. - # Otherwise, Jscompile will complain. - remoting_webapp_shared_js_core_files + - remoting_webapp_shared_js_auth_google_files + - remoting_webapp_shared_js_client_files + - remoting_webapp_shared_js_host_files + - remoting_webapp_shared_js_logging_files + - remoting_webapp_shared_js_ui_files + - remoting_webapp_shared_js_signaling_files + - remoting_webapp_js_it2me_host_control_files + - [ - "crd/js/crd_auth_dialog.js", - "crd/js/public_session_main.js", - ] - -# These template files are used to construct public_session.html. -remoting_webapp_public_session_template_files = [ "crd/html/dialog_host.html" ] - -# -# DesktopRemoting background.html generation files. -# - -remoting_webapp_template_background = "crd/html/template_background.html" - -# These JS files are specific to the background page and are not part of -# the main JS files. -remoting_webapp_background_html_js_files = [ - "base/js/website_usage_tracker.js", - "crd/js/activation_handler.js", - "crd/js/app_launcher.js", - "crd/js/background.js", - "crd/js/options_export.js", -] - -# All the JavaScript files required by background.html. -remoting_webapp_background_html_all_js_files = - remoting_webapp_background_html_js_files -remoting_webapp_background_html_all_js_files += [ - "base/js/base.js", - "base/js/chromoting_event.js", - "base/js/error.js", - "base/js/identity.js", - "base/js/ipc.js", - "base/js/l10n.js", - "base/js/oauth2.js", - "base/js/oauth2_api.js", - "base/js/oauth2_api_impl.js", - "base/js/platform.js", - "base/js/plugin_settings.js", - "base/js/telemetry_event_writer.js", - "base/js/typecheck.js", - "base/js/xhr.js", - "base/js/xhr_event_writer.js", - "crd/js/host_controller.js", - "crd/js/host_daemon_facade.js", - "crd/js/native_message_host_log_message_handler.js", -] - -# -# DesktopRemoting wcs_sandbox.html generation files. -# - -remoting_webapp_template_wcs_sandbox = "base/html/template_wcs_sandbox.html" - -# These JS files are specific to the WCS sandbox page and are not part of -# the main JS files. -remoting_webapp_wcs_sandbox_html_js_files = [ - "crd/js/wcs.js", - "crd/js/wcs_loader.js", - "crd/js/wcs_sandbox_content.js", - "crd/js/xhr_proxy.js", -] - -# All the JavaScript files required by wcs_sandbox.html. -remoting_webapp_wcs_sandbox_html_all_js_files = - remoting_webapp_wcs_sandbox_html_js_files -remoting_webapp_wcs_sandbox_html_all_js_files += [ - "base/js/chromoting_event.js", - "base/js/error.js", - "base/js/platform.js", - "base/js/plugin_settings.js", -] - -# -# DesktopRemoting message_window.html generation files. -# - -remoting_webapp_template_message_window = - "base/html/template_message_window.html" - -# These JS files are specific to the message window page and are not part of -# the main JS files. -remoting_webapp_message_window_html_js_files = [ "base/js/message_window.js" ] - -# All the JavaScript files required by message_window.html. -remoting_webapp_message_window_html_all_js_files = - remoting_webapp_message_window_html_js_files + [ "base/js/base.js" ] - -# -# All the JavaScript files required by credits.html -# - -remoting_webapp_credits_html_all_js_files = [ "base/js/credits_js.js" ] - -# -# DesktopRemoting webapp JS and resource files. -# - -# All the JavaScript files that are shared by webapps. -remoting_webapp_shared_js_files = remoting_webapp_shared_main_html_js_files + - remoting_webapp_background_html_js_files + - remoting_webapp_credits_html_all_js_files + - remoting_webapp_message_window_html_js_files + - remoting_webapp_wcs_sandbox_html_js_files + - # JS files referenced in manifest.json. - remoting_webapp_js_auth_v1_files - -# All the JavaScript files required by DesktopRemoting. -remoting_webapp_crd_js_files = - remoting_webapp_shared_js_files + remoting_webapp_crd_main_html_all_js_files - -remoting_webapp_info_files = [ - "../resources/chromoting16.webp", - "../resources/chromoting48.webp", - "../resources/chromoting128.webp", -] - -# All the resource files required by DesktopRemoting. -remoting_webapp_resource_files = [ - "../resources/disclosure_arrow_down.webp", - "../resources/disclosure_arrow_right.webp", - "../resources/drag.webp", - "../resources/host_setup_instructions.webp", - "../resources/icon_close.webp", - "../resources/icon_cross.webp", - "../resources/icon_disconnect.webp", - "../resources/icon_fullscreen.webp", - "../resources/icon_host.webp", - "../resources/icon_maximize_restore.webp", - "../resources/icon_minimize.webp", - "../resources/icon_options.webp", - "../resources/icon_pencil.webp", - "../resources/icon_warning.webp", - "../resources/infographic_my_computers.webp", - "../resources/infographic_remote_assistance.webp", - "../resources/plus.webp", - "../resources/reload.webp", - "../resources/tick.webp", - "base/html/connection_stats.css", - "base/html/credits_css.css", - "base/html/main.css", - "base/html/message_window.css", - "base/resources/open_sans.css", - "base/resources/open_sans.woff", - "base/resources/spinner.gif", - "crd/html/butter_bar.css", - "crd/html/crd_main.css", - "crd/html/toolbar.css", - "crd/html/menu_button.css", - "crd/html/public_session.css", - "crd/html/window_frame.css", - "crd/resources/scale-to-fit.webp", -] - -remoting_webapp_crd_files = - remoting_webapp_info_files + remoting_webapp_crd_js_files + - remoting_webapp_resource_files + - remoting_webapp_public_session_html_all_js_files - -# Files that contain localizable strings. -desktop_remoting_webapp_localizable_files = - [ - "webapp/crd/manifest.json.jinja2", - remoting_webapp_template_background, - remoting_webapp_template_main, - remoting_webapp_template_message_window, - remoting_webapp_template_wcs_sandbox, - ] + remoting_webapp_template_files + remoting_webapp_crd_js_files - -webapp_js_files = remoting_webapp_unittest_html_all_js_files + - remoting_webapp_wcs_sandbox_html_js_files + - remoting_webapp_background_html_js_files |