summaryrefslogtreecommitdiff
path: root/chromium/remoting
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 15:05:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:33:47 +0000
commite684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch)
treed55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/remoting
parent2b94bfe47ccb6c08047959d1c26e392919550e86 (diff)
downloadqtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/remoting')
-rw-r--r--chromium/remoting/android/BUILD.gn7
-rw-r--r--chromium/remoting/client/BUILD.gn1
-rw-r--r--chromium/remoting/client/jni/BUILD.gn7
-rw-r--r--chromium/remoting/host/BUILD.gn10
-rw-r--r--chromium/remoting/host/file_transfer/BUILD.gn35
-rw-r--r--chromium/remoting/host/installer/mac/BUILD.gn6
-rw-r--r--chromium/remoting/host/installer/win/BUILD.gn4
-rw-r--r--chromium/remoting/host/win/BUILD.gn2
-rw-r--r--chromium/remoting/proto/BUILD.gn1
-rw-r--r--chromium/remoting/protocol/BUILD.gn3
-rw-r--r--chromium/remoting/webapp/build_template.gni4
11 files changed, 70 insertions, 10 deletions
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index cc6902f83e9..0821d130965 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/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("//base/android/jni_generator/jni_exception_list.gni")
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//remoting/android/client_java_tmpl.gni")
@@ -22,12 +21,6 @@ generate_jni("jni_headers") {
jni_package = "remoting"
}
-generate_jni_registration("remoting_jni_registration") {
- target = ":remoting_apk"
- output = "$root_gen_dir/remoting/client/${target_name}.h"
- exception_files = jni_exception_files
-}
-
_raw_resources_base_dir = "$target_gen_dir/credits_resources_raw/res"
# The target is named this way, instead of "..._raw_resources", specifically
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index b862dc18290..df05c6f12b5 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -64,6 +64,7 @@ static_library("client") {
"//mojo/core/embedder",
"//remoting/client/input",
"//remoting/client/ui",
+ "//services/network:network_service",
"//services/network/public/mojom",
]
diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn
index 6d097626e85..34c0896571d 100644
--- a/chromium/remoting/client/jni/BUILD.gn
+++ b/chromium/remoting/client/jni/BUILD.gn
@@ -19,7 +19,6 @@ group("jni") {
shared_library("remoting_client_jni") {
deps = [
"//remoting/android:jni_headers",
- "//remoting/android:remoting_jni_registration",
"//remoting/base",
"//remoting/client",
"//remoting/client/display",
@@ -45,7 +44,11 @@ shared_library("remoting_client_jni") {
"android",
"EGL",
]
- configs += [ "//remoting/build/config:enable_webrtc_remoting_client" ]
+ configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+ configs += [
+ "//build/config/android:hide_all_but_jni",
+ "//remoting/build/config:enable_webrtc_remoting_client",
+ ]
assert_no_deps = [ "//third_party/ffmpeg:*" ]
}
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 563d8318c23..67e7d837164 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -54,6 +54,10 @@ process_version("remoting_version") {
# stripping code.
static_library("host") {
sources = [
+ "action_executor.cc",
+ "action_executor.h",
+ "action_message_handler.cc",
+ "action_message_handler.h",
"audio_capturer.cc",
"audio_capturer.h",
"audio_capturer_chromeos.cc",
@@ -108,6 +112,8 @@ static_library("host") {
"daemon_process_win.cc",
"desktop_capturer_proxy.cc",
"desktop_capturer_proxy.h",
+ "desktop_display_info.cc",
+ "desktop_display_info.h",
"desktop_environment.h",
"desktop_environment_options.cc",
"desktop_environment_options.h",
@@ -189,6 +195,8 @@ static_library("host") {
"input_injector_mac.cc",
"input_injector_win.cc",
"input_injector_x11.cc",
+ "ipc_action_executor.cc",
+ "ipc_action_executor.h",
"ipc_audio_capturer.cc",
"ipc_audio_capturer.h",
"ipc_constants.cc",
@@ -300,6 +308,7 @@ static_library("host") {
"//remoting/host/security_key",
"//remoting/protocol",
"//remoting/resources",
+ "//services/network:network_service",
"//third_party/webrtc/modules/desktop_capture",
# //remoting uses the power_save_blocker directly. See crbug.com/689423
@@ -502,6 +511,7 @@ source_set("unit_tests") {
deps = [
":host",
":test_support",
+ "//remoting/host/file_transfer:unit_tests",
"//remoting/host/it2me:common",
"//remoting/host/native_messaging",
"//remoting/host/security_key:unit_tests",
diff --git a/chromium/remoting/host/file_transfer/BUILD.gn b/chromium/remoting/host/file_transfer/BUILD.gn
new file mode 100644
index 00000000000..01d92068b4e
--- /dev/null
+++ b/chromium/remoting/host/file_transfer/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright 2018 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("//remoting/build/config/remoting_build.gni")
+
+source_set("file_transfer") {
+ public = [
+ "file_operations.h",
+ "local_file_operations.h",
+ ]
+
+ sources = [
+ "local_file_operations.cc",
+ ]
+
+ deps = [
+ "//base",
+ "//remoting/protocol",
+ ]
+}
+
+source_set("unit_tests") {
+ testonly = true
+
+ sources = [
+ "local_file_operations_unittest.cc",
+ ]
+
+ deps = [
+ ":file_transfer",
+ "//remoting/protocol",
+ "//testing/gtest",
+ ]
+}
diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn
index 67d9574df65..f4b135738b7 100644
--- a/chromium/remoting/host/installer/mac/BUILD.gn
+++ b/chromium/remoting/host/installer/mac/BUILD.gn
@@ -36,6 +36,10 @@ action("remoting_me2me_host_archive") {
script = "//remoting/host/installer/build-installer-archive.py"
+ sources = [
+ "//build/android/gyp/util/build_utils.py",
+ ]
+
args = [
rebase_path("$target_gen_dir/remoting_installation", root_build_dir),
rebase_path(zip_path, root_build_dir),
@@ -115,7 +119,7 @@ mac_app_bundle("remoting_host_uninstaller") {
"BUNDLE_ID=$uninstaller_bundle_id",
"VERSION_FULL=$remoting_version_full",
"VERSION_SHORT=$remoting_version_short",
- "MACOSX_DEPLOYMENT_TARGET=10.7",
+ "MACOSX_DEPLOYMENT_TARGET=10.10",
]
sources = [
diff --git a/chromium/remoting/host/installer/win/BUILD.gn b/chromium/remoting/host/installer/win/BUILD.gn
index 645b9718f77..62d22934bb8 100644
--- a/chromium/remoting/host/installer/win/BUILD.gn
+++ b/chromium/remoting/host/installer/win/BUILD.gn
@@ -8,6 +8,10 @@ import("//remoting/host/installer/win/generate_clsids.gni")
action("remoting_me2me_host_archive") {
script = "//remoting/host/installer/build-installer-archive.py"
+ sources = [
+ "//build/android/gyp/util/build_utils.py",
+ ]
+
deps = [
"//remoting/host:remoting_native_messaging_manifests",
"//remoting/host:remoting_start_host",
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 3e7054e4b9c..79dabc144b8 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -96,6 +96,8 @@ source_set("win") {
"rdp_client_window.h",
"security_descriptor.cc",
"security_descriptor.h",
+ "session_action_executor.cc",
+ "session_action_executor.h",
"session_desktop_environment.cc",
"session_desktop_environment.h",
"session_input_injector.cc",
diff --git a/chromium/remoting/proto/BUILD.gn b/chromium/remoting/proto/BUILD.gn
index e579b41c470..07891d167bb 100644
--- a/chromium/remoting/proto/BUILD.gn
+++ b/chromium/remoting/proto/BUILD.gn
@@ -13,6 +13,7 @@ group("proto_lite") {
proto_library("proto") {
sources = [
+ "action.proto",
"audio.proto",
"control.proto",
"event.proto",
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index a7706857edf..fb9f4b4af44 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -54,6 +54,8 @@ static_library("protocol") {
"datagram_channel_factory.h",
"errors.cc",
"errors.h",
+ "file_transfer_helpers.cc",
+ "file_transfer_helpers.h",
"frame_consumer.h",
"frame_stats.cc",
"frame_stats.h",
@@ -257,6 +259,7 @@ static_library("protocol") {
}
deps += [
+ "//third_party/webrtc/api:create_peerconnection_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",
diff --git a/chromium/remoting/webapp/build_template.gni b/chromium/remoting/webapp/build_template.gni
index 05790597600..d5ed9453bb0 100644
--- a/chromium/remoting/webapp/build_template.gni
+++ b/chromium/remoting/webapp/build_template.gni
@@ -214,6 +214,10 @@ template("desktop_remoting_webapp") {
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