Skip to content

Commit

Permalink
Enable gn check for //remoting/client/*
Browse files Browse the repository at this point in the history
To resolve a circular dependency, the QueuedTaskPoster util has been
moved to //remoting/base.

Fixed: 1159002, 1159003
Change-Id: I92cf29f70b27b6b975b711436148b5715b9d93e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679438
Reviewed-by: Erik Staab <estaab@chromium.org>
Reviewed-by: Gary Kacmarcik <garykac@chromium.org>
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Cr-Commit-Position: refs/heads/master@{#857854}
  • Loading branch information
andruud authored and Chromium LUCI CQ committed Feb 25, 2021
1 parent c0a0470 commit b04792d
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 12 deletions.
2 changes: 0 additions & 2 deletions .gn
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ no_check_targets = [
"//ppapi/proxy:*", # 31 errors
"//ppapi/thunk:*", # 1071 errors
"//ppapi:*", # 3 errors
"//remoting/client/display:*", # 55 errors
"//remoting/client/jni:*", # 8 errors
"//remoting/codec:*", # 32 errors
"//remoting/host/file_transfer:*", # 43 errors
"//remoting/host/installer/mac:*", # 1 error
Expand Down
3 changes: 3 additions & 0 deletions remoting/base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ source_set("base") {
"protobuf_http_stream_parser.h",
"protobuf_http_stream_request.cc",
"protobuf_http_stream_request.h",
"queued_task_poster.cc",
"queued_task_poster.h",
"rate_counter.cc",
"rate_counter.h",
"result.h",
Expand Down Expand Up @@ -220,6 +222,7 @@ source_set("unit_tests") {
"oauth_token_getter_proxy_unittest.cc",
"protobuf_http_client_unittest.cc",
"protobuf_http_stream_parser_unittest.cc",
"queued_task_poster_unittest.cc",
"rate_counter_unittest.cc",
"result_unittest.cc",
"rsa_key_pair_unittest.cc",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "remoting/client/queued_task_poster.h"
#include "remoting/base/queued_task_poster.h"

#include "base/bind.h"
#include "base/check.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef REMOTING_CLIENT_QUEUED_TASK_POSTER_H_
#define REMOTING_CLIENT_QUEUED_TASK_POSTER_H_
#ifndef REMOTING_BASE_QUEUED_TASK_POSTER_H_
#define REMOTING_BASE_QUEUED_TASK_POSTER_H_

#include <memory>

Expand Down Expand Up @@ -47,4 +47,4 @@ class QueuedTaskPoster {

} // namespace remoting

#endif // REMOTING_CLIENT_QUEUED_TASK_POSTER_H_
#endif // REMOTING_BASE_QUEUED_TASK_POSTER_H_
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "remoting/client/queued_task_poster.h"
#include "remoting/base/queued_task_poster.h"

#include <memory>

Expand Down
3 changes: 0 additions & 3 deletions remoting/client/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ static_library("client") {
"host_experiment_sender.h",
"in_memory_log_handler.cc",
"in_memory_log_handler.h",
"queued_task_poster.cc",
"queued_task_poster.h",
"software_video_renderer.cc",
"software_video_renderer.h",
]
Expand Down Expand Up @@ -92,7 +90,6 @@ source_set("unit_tests") {
"client_telemetry_logger_unittest.cc",
"dual_buffer_frame_consumer_unittest.cc",
"empty_cursor_filter_unittest.cc",
"queued_task_poster_unittest.cc",
"software_video_renderer_unittest.cc",
]

Expand Down
5 changes: 5 additions & 0 deletions remoting/client/display/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ source_set("display") {

public_deps = [ "//remoting/proto" ]
deps = [
"//base",
"//remoting/base",
"//remoting/client/ui:ui_manipulation",
"//third_party/libyuv",
"//third_party/protobuf:protobuf_lite",
"//third_party/webrtc_overrides:webrtc_component",
Expand Down Expand Up @@ -89,6 +92,8 @@ if (is_win) {

deps = [
":display",
"//base",
"//base/test:test_support",
"//remoting/proto",
"//testing/gmock",
"//testing/gtest",
Expand Down
2 changes: 1 addition & 1 deletion remoting/client/display/renderer_proxy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "base/bind.h"
#include "base/check_op.h"
#include "remoting/base/queued_task_poster.h"
#include "remoting/client/display/gl_renderer.h"
#include "remoting/client/queued_task_poster.h"
#include "remoting/client/ui/view_matrix.h"

namespace remoting {
Expand Down
3 changes: 3 additions & 0 deletions remoting/client/jni/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ shared_library("remoting_client_jni") {
deps = [
"//remoting/android:jni_headers",
"//remoting/base",
"//remoting/base:authorization",
"//remoting/client",
"//remoting/client/audio",
"//remoting/client/display",
"//remoting/client/notification",
"//remoting/proto/remoting/v1:directory_proto",
"//remoting/protocol",
"//services/network/public/cpp",
"//ui/gfx",
]
sources = [
Expand Down
2 changes: 1 addition & 1 deletion remoting/client/jni/jni_gl_display_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "base/android/scoped_java_ref.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "remoting/base/queued_task_poster.h"
#include "remoting/client/display/gl_renderer.h"
#include "remoting/client/display/gl_renderer_delegate.h"
#include "remoting/client/queued_task_poster.h"
#include "remoting/protocol/cursor_shape_stub.h"

namespace remoting {
Expand Down

0 comments on commit b04792d

Please sign in to comment.