diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/remoting | |
parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/base/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/remoting/client/jni/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/client/plugin/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/host/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/remoting/host/it2me/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/host/linux/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/remoting/host/mac/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/host/security_key/BUILD.gn | 6 | ||||
-rw-r--r-- | chromium/remoting/host/win/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/test/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn | 1 |
11 files changed, 10 insertions, 18 deletions
diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn index 19ddacd11ab..cc3796bd535 100644 --- a/chromium/remoting/base/BUILD.gn +++ b/chromium/remoting/base/BUILD.gn @@ -177,7 +177,7 @@ source_set("unit_tests") { deps = [ ":test_support", - "//mojo/edk", + "//mojo/core/embedder", "//net:test_support", "//third_party/libyuv", "//third_party/webrtc/modules/desktop_capture:primitives", diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn index 8f6a569f164..6d097626e85 100644 --- a/chromium/remoting/client/jni/BUILD.gn +++ b/chromium/remoting/client/jni/BUILD.gn @@ -18,7 +18,6 @@ group("jni") { shared_library("remoting_client_jni") { deps = [ - "//build/config:exe_and_shlib_deps", "//remoting/android:jni_headers", "//remoting/android:remoting_jni_registration", "//remoting/base", diff --git a/chromium/remoting/client/plugin/BUILD.gn b/chromium/remoting/client/plugin/BUILD.gn index a2aa05c6582..6c42277ca4b 100644 --- a/chromium/remoting/client/plugin/BUILD.gn +++ b/chromium/remoting/client/plugin/BUILD.gn @@ -58,6 +58,7 @@ executable("remoting_client_plugin_newlib") { "//remoting/signaling", "//third_party/libyuv", "//third_party/webrtc/modules/desktop_capture:primitives", + "//third_party/webrtc/system_wrappers:metrics_default", "//ui/events:dom_keycode_converter", ] diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index b0fca33bffe..b495aded5d0 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -573,7 +573,6 @@ if (enable_remoting_host) { ] deps = [ - "//build/config:exe_and_shlib_deps", "//third_party/libjingle_xmpp", "//third_party/webrtc_overrides:init_webrtc", ] @@ -732,7 +731,7 @@ if (enable_me2me_host) { } if (remoting_multi_process != 0) { - deps += [ "//mojo/edk" ] + deps += [ "//mojo/core/embedder" ] } } @@ -774,7 +773,6 @@ if (enable_me2me_host) { deps = [ ":remoting_me2me_host_static", - "//build/config:exe_and_shlib_deps", "//remoting/base:breakpad", "//remoting/host/installer:credits", "//remoting/resources", diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn index 7e2df5ce175..b69e217f0e4 100644 --- a/chromium/remoting/host/it2me/BUILD.gn +++ b/chromium/remoting/host/it2me/BUILD.gn @@ -202,7 +202,6 @@ if (!is_chromeos && enable_remoting_host) { deps = [ ":common", - "//build/config:exe_and_shlib_deps", "//remoting/host", "//remoting/host/native_messaging", "//remoting/proto", diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn index 89a9c708516..6fca9dc33af 100644 --- a/chromium/remoting/host/linux/BUILD.gn +++ b/chromium/remoting/host/linux/BUILD.gn @@ -17,7 +17,6 @@ if (enable_me2me_host) { deps = [ "//base", - "//build/config:exe_and_shlib_deps", ] libs = [ "pam" ] @@ -59,7 +58,6 @@ if (enable_me2me_host) { ] deps = [ ":remoting_user_session", - "//build/config:exe_and_shlib_deps", ] if (is_component_build) { sources += [ "$root_build_dir/libbase.so" ] @@ -67,6 +65,7 @@ if (enable_me2me_host) { } if (!libcpp_is_static && use_custom_libcxx) { sources += [ "$root_build_dir/libc++.so" ] + deps += [ "//buildtools/third_party/libc++" ] } } @@ -133,7 +132,6 @@ executable("remoting_native_messaging_host") { deps = [ "//base", - "//build/config:exe_and_shlib_deps", "//net", "//remoting/base:breakpad", "//remoting/host", diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn index 81c434ec213..f9d46f433c1 100644 --- a/chromium/remoting/host/mac/BUILD.gn +++ b/chromium/remoting/host/mac/BUILD.gn @@ -74,7 +74,6 @@ target("mac_app_bundle", "remoting_me2me_host") { # } deps = [ - "//build/config:exe_and_shlib_deps", "//remoting/base:breakpad", "//remoting/host:main", "//remoting/host:remoting_me2me_host_static", diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn index d865abebe62..5a0e95f3fb8 100644 --- a/chromium/remoting/host/security_key/BUILD.gn +++ b/chromium/remoting/host/security_key/BUILD.gn @@ -36,7 +36,8 @@ source_set("security_key") { deps = [ "//ipc", - "//mojo/edk", + "//mojo/public/cpp/platform", + "//mojo/public/cpp/system", "//remoting/proto", "//third_party/webrtc/modules/desktop_capture", ] @@ -59,6 +60,7 @@ source_set("main") { ] deps = [ "//base:debugging_buildflags", + "//mojo/core/embedder", ] } @@ -99,7 +101,7 @@ source_set("unit_tests") { ":test_support", ] deps = [ - "//mojo/edk/test:test_support", + "//mojo/core/test:test_support", ] if (is_posix) { diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn index 461f190e99e..4102b23dace 100644 --- a/chromium/remoting/host/win/BUILD.gn +++ b/chromium/remoting/host/win/BUILD.gn @@ -391,7 +391,8 @@ shared_library("remoting_core") { "//base/third_party/dynamic_annotations", "//build/win:default_exe_manifest", "//ipc", - "//mojo/edk", + "//mojo/public/cpp/platform", + "//mojo/public/cpp/system", "//net", "//remoting/base", "//remoting/base:breakpad", diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn index fa9826c43ec..fa1b4c3c0c0 100644 --- a/chromium/remoting/test/BUILD.gn +++ b/chromium/remoting/test/BUILD.gn @@ -104,7 +104,6 @@ executable("chromoting_test_driver") { deps = [ ":test_support", "//base/test:test_support", - "//build/config:exe_and_shlib_deps", "//build/win:default_exe_manifest", "//testing/gtest", ] @@ -143,7 +142,6 @@ executable("ar_sample_test_driver") { deps = [ ":ar_test_driver_common", "//base/test:test_support", - "//build/config:exe_and_shlib_deps", "//build/win:default_exe_manifest", "//testing/gtest", ] @@ -195,7 +193,6 @@ if (enable_remoting_host && !is_android && !is_chromeos) { deps = [ ":it2me_standalone_host", - "//build/config:exe_and_shlib_deps", ] if (is_desktop_linux) { @@ -222,7 +219,6 @@ if (enable_remoting_host && !is_android && !is_chromeos) { deps = [ "//base", - "//build/config:exe_and_shlib_deps", ] } } diff --git a/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn b/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn index 13cc0124cf6..90d9565b3e8 100644 --- a/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn +++ b/chromium/remoting/tools/javascript_key_tester/pnacl/BUILD.gn @@ -11,7 +11,6 @@ executable("remoting_key_tester_newlib") { ] deps = [ - "//build/config:exe_and_shlib_deps", "//ppapi/cpp", "//ppapi/native_client:ppapi_lib", ] |