Skip to content
Merged

Cleanup #4219

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions internal/base/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ licenses(["notice"])

cc_library(
name = "base",
srcs = [
],
hdrs = [
"observer_list.h",
],
visibility = [
"//internal/account:__subpackages__",
"//internal/platform:__subpackages__",
"//internal/test:__pkg__",
"//location/nearby/sharing/lib:__subpackages__",
"//sharing:__subpackages__",
],
deps = [
Expand Down
1 change: 0 additions & 1 deletion internal/platform/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ cc_library(
"//connections/implementation/flags:connections_flags",
"//internal/base",
"//internal/flags:nearby_flags",
"//internal/platform/implementation:account_manager",
"//internal/platform/implementation:comm",
"//internal/platform/implementation:platform",
"//internal/platform/implementation:wifi_utils",
Expand Down
63 changes: 0 additions & 63 deletions internal/platform/implementation/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -17,69 +17,6 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")

licenses(["notice"])

cc_library(
name = "auth_status",
hdrs = ["auth_status.h"],
visibility = [
"//internal/auth:__pkg__",
"//internal/platform/implementation:__subpackages__",
"//location/nearby/cpp/sharing/clients/cpp:__subpackages__",
],
)

cc_library(
name = "account_info",
hdrs = ["account_info.h"],
visibility = [
"//internal/auth:__pkg__",
"//internal/platform/implementation:__subpackages__",
"//location/nearby/cpp/sharing/clients/cpp:__subpackages__",
],
)

cc_library(
name = "account_manager",
hdrs = ["account_manager.h"],
visibility = [
"//internal/account:__pkg__",
"//internal/platform:__pkg__",
"//internal/platform/implementation:__subpackages__",
"//internal/test:__subpackages__",
"//location/nearby/cpp/sharing/clients/cpp:__subpackages__",
"//location/nearby/sharing/lib:__subpackages__",
"//location/nearby/sharing/sdk/quick_share_server:__pkg__",
"//sharing:__subpackages__",
],
deps = [
":account_info",
":signin_attempt",
"@com_google_absl//absl/functional:any_invocable",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings:string_view",
],
)

cc_library(
name = "signin_attempt",
hdrs = ["signin_attempt.h"],
visibility = [
"//internal/account:__pkg__",
"//internal/auth:__pkg__",
"//internal/platform/implementation:__subpackages__",
"//internal/test:__subpackages__",
"//location/nearby/cpp/sharing/clients/cpp:__subpackages__",
"//location/nearby/sharing/sdk/quick_share_server:__pkg__",
"//sharing:__subpackages__",
],
deps = [
":account_info",
":auth_status",
"@com_google_absl//absl/functional:any_invocable",
"@com_google_absl//absl/strings:string_view",
],
)

cc_library(
name = "types",
hdrs = [
Expand Down
35 changes: 0 additions & 35 deletions internal/platform/implementation/account_info.h

This file was deleted.

89 changes: 0 additions & 89 deletions internal/platform/implementation/account_manager.h

This file was deleted.

88 changes: 0 additions & 88 deletions internal/platform/implementation/auth_status.h

This file was deleted.

48 changes: 0 additions & 48 deletions internal/platform/implementation/signin_attempt.h

This file was deleted.

1 change: 0 additions & 1 deletion internal/platform/tachyon_express_signaling_messenger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include "internal/account/account_manager_impl.h"
#include "internal/platform/byte_array.h"
#include "internal/platform/count_down_latch.h"
#include "internal/platform/implementation/account_manager.h"
#include "internal/platform/implementation/webrtc.h"
#include "internal/platform/logging.h"
#include "internal/proto/messaging.grpc.pb.h"
Expand Down
4 changes: 2 additions & 2 deletions internal/platform/tachyon_express_signaling_messenger.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <memory>
#include <string>

#include "location/nearby/sharing/lib/account/account_manager.h"
#include "absl/base/thread_annotations.h"
#include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h"
Expand All @@ -30,7 +31,6 @@
#include "third_party/grpc/include/grpcpp/support/client_callback.h"
#include "third_party/grpc/include/grpcpp/support/status.h"
#include "internal/platform/byte_array.h"
#include "internal/platform/implementation/account_manager.h"
#include "internal/platform/implementation/webrtc.h"
#include "internal/proto/messaging.grpc.pb.h"

Expand Down Expand Up @@ -94,7 +94,7 @@ class TachyonExpressSignalingMessenger : public api::WebRtcSignalingMessenger {
std::unique_ptr<google::internal::communications::instantmessaging::v1::grpc::
Messaging::StubInterface>
messaging_stub_;
AccountManager* const account_manager_;
nearby::sharing::AccountManager* const account_manager_;
std::shared_ptr<ReceiveMessagesReader> reader_ = nullptr;
};

Expand Down
Loading
Loading