Skip to content

Commit

Permalink
internal changes
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 709111944
  • Loading branch information
@ftsui @copybara-github
ftsui authored and copybara-github committed Dec 23, 2024
1 parent dbc81e9 commit f1906d6
Show file tree
Hide file tree
Showing 29 changed files with 43 additions and 81 deletions.
13 changes: 0 additions & 13 deletions connections/implementation/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,19 +157,6 @@ cc_library(
],
)

cc_library(
name = "message_lite",
hdrs = [
"message_lite.h",
],
visibility = [
"//connections:__subpackages__",
],
deps = [
"@com_google_protobuf//:protobuf_lite",
],
)

cc_library(
name = "internal_test",
testonly = True,
Expand Down
2 changes: 1 addition & 1 deletion connections/implementation/analytics/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ cc_library(
"//internal/platform/implementation:types",
"//internal/proto/analytics:connections_log_cc_proto",
"//proto:connections_enums_cc_proto",
"//third_party/protobuf:protobuf_lite",
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:btree",
Expand All @@ -45,7 +46,6 @@ cc_library(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/time",
"@com_google_protobuf//:protobuf_lite",
],
)

Expand Down
20 changes: 0 additions & 20 deletions connections/implementation/message_lite.h
View file

This file was deleted.

2 changes: 0 additions & 2 deletions connections/implementation/offline_frames.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "connections/implementation/offline_frames.h"

#include <cstdint>
#include <memory>
#include <string>
#include <utility>
#include <vector>
Expand All @@ -36,7 +35,6 @@ namespace {

using ExceptionOrOfflineFrame =
ExceptionOr<::location::nearby::connections::OfflineFrame>;
using MessageLite = ::google::protobuf::MessageLite;
using ::location::nearby::connections::BandwidthUpgradeNegotiationFrame;
using ::location::nearby::connections::ConnectionRequestFrame;
using ::location::nearby::connections::ConnectionResponseFrame;
Expand Down
6 changes: 3 additions & 3 deletions connections/implementation/proto/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down
4 changes: 2 additions & 2 deletions fastpair/proto/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down
2 changes: 1 addition & 1 deletion internal/analytics/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ cc_library(
visibility = ["//visibility:public"],
deps = [
":event_logger",
"//third_party/protobuf:protobuf_lite",
"@com_google_googletest//:gtest_for_library_testonly",
"@com_google_protobuf//:protobuf_lite",
],
)
6 changes: 3 additions & 3 deletions internal/data/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand All @@ -32,11 +32,11 @@ cc_library(
"//third_party/leveldb:db",
"//third_party/leveldb:table",
"//third_party/leveldb:util",
"//third_party/protobuf:protobuf_lite",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/functional:any_invocable",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",
"@com_google_protobuf//:protobuf_lite",
],
)

Expand Down
4 changes: 2 additions & 2 deletions internal/platform/implementation/g3/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ cc_library(
"//internal/platform/implementation/shared:count_down_latch",
"//internal/platform/implementation/shared:posix_mutex",
"//internal/test",
"//thread",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:btree",
"@com_google_absl//absl/container:flat_hash_map",
Expand All @@ -52,7 +53,6 @@ cc_library(
"@com_google_absl//absl/synchronization",
"@com_google_absl//absl/time",
"@com_google_absl//absl/types:span",
"@com_google_nisaba//nisaba/port:thread_pool",
"@nlohmann_json//:json",
],
alwayslink = 1,
Expand Down Expand Up @@ -163,13 +163,13 @@ cc_library(
"//internal/platform/implementation:types",
"//internal/platform/implementation/shared:count_down_latch",
"//internal/platform/implementation/shared:file",
"//thread",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/time",
"@com_google_nisaba//nisaba/port:thread_pool",
],
)

Expand Down
6 changes: 3 additions & 3 deletions internal/proto/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# limitations under the License.

# NOTE: gRPC libraries not needed.
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

proto_library(
name = "credential_proto",
Expand Down
8 changes: 4 additions & 4 deletions internal/proto/analytics/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("//third_party/protobuf/bazel:java_proto_library.bzl", "java_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down
4 changes: 2 additions & 2 deletions presence/proto/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

proto_library(
name = "presence_frame_proto",
Expand Down
6 changes: 3 additions & 3 deletions proto/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# Proto for Nearby products

# Placeholder: load py_proto_library
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:java_proto_library.bzl", "java_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down
2 changes: 1 addition & 1 deletion proto/connections_enums.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package location.nearby.proto.connections;

// import "logs/proto/logs_annotations/logs_annotations.proto";

// option (logs_proto.file_not_used_for_logging_except_enums) = true;
option (logs_proto.file_not_used_for_logging_except_enums) = true;
option optimize_for = LITE_RUNTIME;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "ConnectionsEnums";
Expand Down
2 changes: 1 addition & 1 deletion proto/connections_westworld_enums.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package location.nearby.proto.connections;

// import "logs/proto/logs_annotations/logs_annotations.proto";

// option (logs_proto.file_not_used_for_logging_except_enums) = true;
option (logs_proto.file_not_used_for_logging_except_enums) = true;
option optimize_for = LITE_RUNTIME;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "ConnectionsWestworldEnums";
Expand Down
6 changes: 3 additions & 3 deletions proto/errorcode/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

# Proto for Nearby products

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down
2 changes: 1 addition & 1 deletion proto/errorcode/error_code_enums.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package location.nearby.errorcode.proto;

// import "logs/proto/logs_annotations/logs_annotations.proto";

// option (logs_proto.file_not_used_for_logging_except_enums) = true;
option (logs_proto.file_not_used_for_logging_except_enums) = true;
option optimize_for = LITE_RUNTIME;
option java_package = "com.google.location.nearby.errorcode.proto";
option java_outer_classname = "ErrorCodeEnums";
Expand Down
2 changes: 1 addition & 1 deletion proto/fast_pair_enums.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package nearby.proto.fastpair;

// import "logs/proto/logs_annotations/logs_annotations.proto";

// option (logs_proto.file_not_used_for_logging_except_enums) = true;
option (logs_proto.file_not_used_for_logging_except_enums) = true;
option optimize_for = LITE_RUNTIME;
// option java_api_version = 2;
option java_package = "nearby.proto.fastpair";
Expand Down
6 changes: 3 additions & 3 deletions proto/mediums/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down
2 changes: 1 addition & 1 deletion proto/mediums/nfc_frames.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package location.nearby.mediums;

// import "storage/datapol/annotations/proto/semantic_annotations.proto";

// option (datapol.file_vetting_status) = "latest";
option (datapol.file_vetting_status) = "latest";
option optimize_for = LITE_RUNTIME;
option java_outer_classname = "NfcFramesProto";
option java_package = "com.google.location.nearby.mediums.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/sharing_enums.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package location.nearby.proto.sharing;
// import "logs/proto/wireless/beto/beto_enums.proto";
// import "logs/proto/wireless/beto/log_dimension_annotations.proto";

// option (logs_proto.file_not_used_for_logging_except_enums) = true;
option (logs_proto.file_not_used_for_logging_except_enums) = true;
option optimize_for = LITE_RUNTIME;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "SharingEnums";
Expand Down
2 changes: 1 addition & 1 deletion sharing/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@ cc_test(
"//sharing/proto:enums_cc_proto",
"//sharing/proto:share_cc_proto",
"//sharing/proto:wire_format_cc_proto",
"//third_party/protobuf:protobuf_lite",
"@com_github_protobuf_matchers//protobuf-matchers",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/memory",
Expand All @@ -598,7 +599,6 @@ cc_test(
"@com_google_absl//absl/time",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest_main",
"@com_google_protobuf//:protobuf_lite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion sharing/analytics/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ cc_library(
"//sharing/common:enum",
"//sharing/proto:enums_cc_proto",
"//sharing/proto/analytics:sharing_log_cc_proto",
"//third_party/protobuf:protobuf_lite",
"@com_google_absl//absl/random",
"@com_google_absl//absl/strings:string_view",
"@com_google_absl//absl/time",
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//:protobuf_lite",
],
)

Expand Down
1 change: 0 additions & 1 deletion sharing/analytics/analytics_recorder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include "sharing/proto/enums.pb.h"
#include "sharing/share_target.h"
#include "sharing/wifi_credentials_attachment.h"
#include "google/protobuf/repeated_ptr_field.h"

namespace nearby {
namespace sharing {
Expand Down
2 changes: 1 addition & 1 deletion sharing/certificates/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ cc_library(
"//sharing/proto:enums_cc_proto",
"//sharing/proto:share_cc_proto",
"//sharing/scheduling",
"//third_party/protobuf:protobuf_lite",
"@com_google_absl//absl/container:btree",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set",
Expand All @@ -71,7 +72,6 @@ cc_library(
"@com_google_absl//absl/synchronization",
"@com_google_absl//absl/time",
"@com_google_absl//absl/types:span",
"@com_google_protobuf//:protobuf_lite",
],
)

Expand Down
1 change: 0 additions & 1 deletion sharing/certificates/nearby_share_certificate_manager_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
#include "sharing/proto/rpc_resources.pb.h"
#include "sharing/scheduling/nearby_share_scheduler.h"
#include "sharing/scheduling/nearby_share_scheduler_factory.h"
#include "google/protobuf/repeated_ptr_field.h"

namespace nearby {
namespace sharing {
Expand Down
1 change: 0 additions & 1 deletion sharing/nearby_sharing_service_impl_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
#include "sharing/transfer_metadata_matchers.h"
#include "sharing/transfer_update_callback.h"
#include "sharing/wifi_credentials_attachment.h"
#include "google/protobuf/repeated_ptr_field.h"

namespace nearby::sharing {
namespace {
Expand Down
4 changes: 2 additions & 2 deletions sharing/proto/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down
4 changes: 2 additions & 2 deletions sharing/proto/analytics/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("//third_party/protobuf/bazel:cc_proto_library.bzl", "cc_proto_library")
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")

licenses(["notice"])

Expand Down

0 comments on commit f1906d6

Please sign in to comment.