Skip to content

Commit

Permalink
Revert "Reland "Enable gn check for //remoting/host""
Browse files Browse the repository at this point in the history 
This reverts commit 1531121.

Reason for revert:
Probably this causes failures at the step to generate build files:
https://ci.chromium.org/p/chrome/builders/ci/mac-chrome/12695

Original change's description:
> Reland "Enable gn check for //remoting/host"
>
> The original patch failed due to a duplicate copy of host_main.cc
> included in remoting_me2me_host_static. This patch fixes it by removing
> the unused #include on host_main.h.
>
> Original patch: http://crrev.com/c/2718573
> Revert patch: http://crrev.com/c/2738999
>
> Fixed: 1159016
> Change-Id: I6a46df9e3e21b8ad9cac2a2078ceb6fedf442e38
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2739765
> Reviewed-by: Erik Staab <estaab@chromium.org>
> Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
> Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
> Commit-Queue: Joey Arhar <jarhar@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#861023}

Change-Id: I55c2d817de11ef91693ca2a41b8b2400910037f5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2745035
Auto-Submit: Hiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#861037}
  • Loading branch information
@nhiroki
nhiroki authored and Chromium LUCI CQ committed Mar 9, 2021
1 parent d94aa1e commit 95f5c06
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 95 deletions.
1 change: 1 addition & 0 deletions .gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ no_check_targets = [
"//remoting/host/security_key:*", # 68 errors
"//remoting/host/setup:*", # 9 errors
"//remoting/host/win:*", # 43 errors
"//remoting/host:*", # 164 errors
"//remoting/ios/app/settings:*", # 6 errors
"//remoting/ios/app:*", # 9 errors
"//remoting/ios/audio:*", # 5 errors
Expand Down
3 changes: 0 additions & 3 deletions media/gpu/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ component("gpu") {
"//media/gpu/vaapi/*",
"//media/mojo/*",
"//remoting/codec:encoder",

# TODO(crbug.com/1184041): Remove //remoting/host:common when the usage is removed.
"//remoting/host:common",
]

if (is_mac) {
Expand Down
82 changes: 3 additions & 79 deletions remoting/host/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,7 @@ source_set("base") {
source_set("client_session_control") {
sources = [ "client_session_control.h" ]

deps = [
"//remoting/protocol",
"//ui/events:events",
]
deps = [ "//remoting/protocol" ]
}

source_set("clipboard") {
Expand All @@ -105,7 +102,6 @@ source_set("clipboard") {
deps = [
":base",
"//base",
"//remoting/base:base",
"//remoting/proto",
"//remoting/protocol",
]
Expand Down Expand Up @@ -331,23 +327,17 @@ static_library("common") {
"//components/policy/core/common",
"//crypto",
"//google_apis",
"//jingle:webrtc_glue",
"//media",
"//remoting/base",
"//remoting/base:authorization",
"//remoting/host/file_transfer:common",
"//remoting/host/input_monitor",
"//remoting/host/security_key",
"//remoting/proto/ftl/v1:ftl_messages",
"//remoting/proto/remoting/v1:remote_support_host_messages",
"//remoting/protocol",
"//remoting/resources",
"//remoting/signaling:signaling",
"//services/network:network_service",
"//services/network/public/cpp:cpp",
"//third_party/libjingle_xmpp",
"//third_party/webrtc_overrides:webrtc_component",
"//ui/events:events",

# //remoting uses the power_save_blocker directly. See crbug.com/689423
"//services/device/wake_lock/power_save_blocker",
Expand Down Expand Up @@ -491,11 +481,9 @@ static_library("common") {
]

deps += [
":base",
":remoting_version",
"//remoting/host/mac:constants",
"//remoting/host/mac:permission_checking",
"//ui/events:events",
]
}

Expand All @@ -520,29 +508,12 @@ static_library("common") {
"touch_injector_win.cc",
"touch_injector_win.h",
"usage_stats_consent_win.cc",

# TODO(crbug.com/1184893): These are in //remoting/host/win:remoting_core, but we can't add a
# dep for it because it would make a circular dependency. These should be
# moved to a new build target that both can depend on if possible.
"host_main.h",
"win/core_resource.h",
"win/etw_trace_consumer.h",
"win/host_event_file_logger.h",
"win/host_event_logger.h",
"win/host_event_windows_event_logger.h",
"win/host_service.h",
"win/unprivileged_process_delegate.h",
"win/wts_session_process_delegate.h",
"worker_process_ipc_delegate.h",
]
libs += [ "crypt32.lib" ]
deps += [
# On Windows, we use //media/gpu/MediaFoundationVideoEncodeAcceleratorWin
# to detect whether HW encoder is supported by the system.
"//media",
"//media/base/win:media_foundation_util",
"//media/gpu:gpu",
"//mojo/core/embedder:embedder",
"//remoting/host/win",
"//remoting/host/win:messages",
"//remoting/host/win:remoting_lib_idl",
Expand Down Expand Up @@ -571,16 +542,9 @@ static_library("test_support") {
configs += [ "//remoting/build/config:version" ]

deps = [
":client_session_control",
"//remoting/codec:encoder",
"//remoting/host/file_transfer:common",
"//remoting/host/security_key:security_key",
"//remoting/proto",
"//remoting/protocol:protocol",
"//remoting/protocol:test_support",
"//testing/gmock",
"//testing/gtest",
"//ui/events:events",
]
public_deps = [
":common",
Expand Down Expand Up @@ -652,32 +616,20 @@ source_set("unit_tests") {
configs += [ "//remoting/build/config:version" ]

deps = [
":base",
":client_session_control",
":common",
":test_support",
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//net:test_support",
"//remoting/codec:encoder",
"//remoting/host/file_transfer:unit_tests",
"//remoting/host/input_monitor:input_monitor",
"//remoting/host/it2me:common",
"//remoting/host/native_messaging",
"//remoting/host/security_key:unit_tests",
"//remoting/host/setup:common",
"//remoting/proto",
"//remoting/proto/remoting/v1:remote_support_host_messages",
"//remoting/protocol:test_support",
"//remoting/resources",
"//remoting/signaling",
"//remoting/signaling:test_support",
"//remoting/signaling:unit_tests",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//ui/base:base",
"//ui/events:events",
]

if (is_linux && !is_chromeos) {
Expand Down Expand Up @@ -761,14 +713,10 @@ if (enable_remoting_host) {
]

deps += [
":common",
"//google_apis",
"//mojo/core/embedder",
"//net",
"//remoting/base:base",
"//remoting/host/setup",
"//services/network:network_service",
"//services/network/public/cpp:cpp",
]
}
}
Expand Down Expand Up @@ -865,30 +813,19 @@ if (enable_me2me_host) {
]

deps = [
":base",
"//base",
"//base:i18n",
"//components/policy/core/common",
"//ipc",
"//jingle:webrtc_glue",
"//mojo/core/embedder",
"//net",
"//remoting/base",
"//remoting/base:authorization",
"//remoting/host",
"//remoting/host/security_key:security_key",
"//remoting/proto",
"//remoting/protocol:protocol",
"//remoting/signaling:signaling",
"//services/network/public/cpp:cpp",
"//third_party/libjingle_xmpp",
"//third_party/webrtc_overrides:webrtc_component",
]

if (use_x11) {
deps += [ "//ui/events/platform/x11:x11" ]
}

if (is_posix) {
sources += [
"pam_authorization_factory_posix.cc",
Expand All @@ -907,12 +844,8 @@ if (enable_me2me_host) {
libs = [ "pam" ]
}

if (is_mac) {
deps += [ "//remoting/host/mac:permission_checking" ]

if (is_official_build) {
sources += [ "internal/internal_mac-inl.h" ]
}
if (is_mac && is_official_build) {
sources += [ "internal/internal_mac-inl.h" ]
}
}

Expand All @@ -930,13 +863,8 @@ if (enable_me2me_host) {
"host_main.h",
]
deps = [
":base",
":common",
"//base",
"//base:debugging_buildflags",
"//mojo/core/embedder:embedder",
"//remoting/base:breakpad",
"//remoting/host/setup:common",
]
}
if (is_mac) {
Expand All @@ -955,12 +883,8 @@ if (enable_me2me_host) {
deps = [
":remoting_me2me_host_static",
"//base",
"//mojo/core/embedder:embedder",
"//remoting/base:breakpad",
"//remoting/host:base",
"//remoting/host:common",
"//remoting/host/installer:credits",
"//remoting/host/setup:common",
"//remoting/resources",
]
}
Expand Down
2 changes: 0 additions & 2 deletions remoting/host/host_attributes.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ std::string GetHostAttributes() {
}
}

// TODO(crbug.com/1184041): Remove this and/or the entire HostAttributes class
// so we can remove //remoting/host:common from //media/gpu's visibility list.
if (media::MediaFoundationVideoEncodeAccelerator
::PreSandboxInitialization() &&
media::InitializeMediaFoundation()) {
Expand Down
1 change: 1 addition & 0 deletions remoting/host/remoting_me2me_host.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#include "remoting/host/host_config.h"
#include "remoting/host/host_event_logger.h"
#include "remoting/host/host_exit_codes.h"
#include "remoting/host/host_main.h"
#include "remoting/host/host_power_save_blocker.h"
#include "remoting/host/host_settings.h"
#include "remoting/host/host_status_logger.h"
Expand Down
20 changes: 9 additions & 11 deletions remoting/host/win/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ shared_library("remoting_core") {
"$root_gen_dir/remoting/version.rc",
"//remoting/host/desktop_process_main.cc",
"//remoting/host/host_main.cc",
"//remoting/host/host_main.h",
"//remoting/host/it2me/it2me_native_messaging_host_main.cc",
"//remoting/host/it2me/it2me_native_messaging_host_main.h",
"//remoting/host/setup/host_starter.cc",
Expand All @@ -368,38 +369,35 @@ shared_library("remoting_core") {
"//remoting/host/setup/me2me_native_messaging_host_main.h",
"//remoting/host/setup/start_host_main.cc",
"//remoting/host/setup/start_host_main.h",
"//remoting/host/worker_process_ipc_delegate.h",
"chromoting_lib.rc",
"chromoting_module.cc",
"chromoting_module.h",
"core.cc",
"core.h",
"core_resource.h",
"elevated_native_messaging_host.cc",
"elevated_native_messaging_host.h",
"etw_trace_consumer.cc",
"etw_trace_consumer.h",
"etw_trace_controller.cc",
"etw_trace_controller.h",
"event_trace_data.cc",
"event_trace_data.h",
"host_event_file_logger.cc",
"host_event_file_logger.h",
"host_event_logger.h",
"host_event_windows_event_logger.cc",
"host_event_windows_event_logger.h",
"host_service.cc",
"host_service.h",
"launch_native_messaging_host_process.cc",
"launch_native_messaging_host_process.h",
"rdp_desktop_session.cc",
"rdp_desktop_session.h",
"unprivileged_process_delegate.cc",
"wts_session_process_delegate.cc",

# TODO(crbug.com/1184893): These files are also listed in //remoting/host:common, so they should probably be moved to a shared target they can both depend on.
"//remoting/host/host_main.h",
"//remoting/host/worker_process_ipc_delegate.h",
"core_resource.h",
"etw_trace_consumer.h",
"host_event_file_logger.h",
"host_event_logger.h",
"host_event_windows_event_logger.h",
"host_service.h",
"unprivileged_process_delegate.h",
"wts_session_process_delegate.cc",
"wts_session_process_delegate.h",
]

Expand Down
1 change: 1 addition & 0 deletions remoting/host/xmpp_register_support_host_request.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "remoting/host/register_support_host_request.h"
#include "remoting/protocol/errors.h"
#include "remoting/signaling/signal_strategy.h"
#include "testing/gtest/include/gtest/gtest_prod.h"

namespace jingle_xmpp {
class XmlElement;
Expand Down

0 comments on commit 95f5c06

Please sign in to comment.