From c2ade33c9c23faeea8f4f33352755d3049998fc9 Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Tue, 9 Jan 2024 13:45:13 -0800 Subject: [PATCH] No public changes. PiperOrigin-RevId: 597033150 --- connections/implementation/analytics/BUILD | 2 +- .../implementation/analytics/analytics_recorder_test.cc | 2 +- connections/implementation/mediums/webrtc/BUILD | 2 +- .../implementation/mediums/webrtc/signaling_frames_test.cc | 2 +- connections/implementation/message_lite.h | 2 +- fastpair/analytics/BUILD | 4 ++-- fastpair/analytics/analytics_recorder.cc | 2 +- fastpair/analytics/analytics_recorder.h | 2 +- fastpair/analytics/analytics_recorder_test.cc | 2 +- internal/analytics/BUILD | 2 +- internal/data/BUILD | 2 +- internal/data/leveldb_data_set.h | 2 +- internal/proto/analytics/BUILD | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/connections/implementation/analytics/BUILD b/connections/implementation/analytics/BUILD index 022bb0cd..059aa381 100644 --- a/connections/implementation/analytics/BUILD +++ b/connections/implementation/analytics/BUILD @@ -65,9 +65,9 @@ cc_test( "//internal/proto/analytics:connections_log_cc_proto", "//net/proto2/contrib/parse_proto:parse_text_proto", "//proto:connections_enums_cc_proto", - "//third_party/protobuf:protobuf_lite", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", + "@com_google_protobuf//:protobuf_lite", ], ) diff --git a/connections/implementation/analytics/analytics_recorder_test.cc b/connections/implementation/analytics/analytics_recorder_test.cc index c1d5fb39..1cde99f2 100644 --- a/connections/implementation/analytics/analytics_recorder_test.cc +++ b/connections/implementation/analytics/analytics_recorder_test.cc @@ -34,7 +34,7 @@ #include "internal/platform/exception.h" #include "internal/proto/analytics/connections_log.proto.h" #include "proto/connections_enums.proto.h" -#include "third_party/protobuf/message_lite.h" +#include "google/protobuf/message_lite.h" namespace nearby { namespace analytics { diff --git a/connections/implementation/mediums/webrtc/BUILD b/connections/implementation/mediums/webrtc/BUILD index 1928212b..d00491c9 100644 --- a/connections/implementation/mediums/webrtc/BUILD +++ b/connections/implementation/mediums/webrtc/BUILD @@ -92,12 +92,12 @@ cc_test( "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation/g3", # buildcleaner: keep + "//third_party/protobuf", "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", "//third_party/webrtc/files/stable/webrtc/api:rtc_error", "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", - "@com_google_protobuf//:protobuf", ], ) diff --git a/connections/implementation/mediums/webrtc/signaling_frames_test.cc b/connections/implementation/mediums/webrtc/signaling_frames_test.cc index a1bb674d..7e11b09a 100644 --- a/connections/implementation/mediums/webrtc/signaling_frames_test.cc +++ b/connections/implementation/mediums/webrtc/signaling_frames_test.cc @@ -16,11 +16,11 @@ #include -#include "google/protobuf/text_format.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/mediums/webrtc_peer_id.h" +#include "google/protobuf/text_format.h" namespace nearby { namespace connections { diff --git a/connections/implementation/message_lite.h b/connections/implementation/message_lite.h index 5ce9d91e..39635702 100644 --- a/connections/implementation/message_lite.h +++ b/connections/implementation/message_lite.h @@ -15,6 +15,6 @@ #ifndef CORE_INTERNAL_MESSAGE_LITE_H_ #define CORE_INTERNAL_MESSAGE_LITE_H_ -#include "google/protobuf/message_lite.h" +#include "google/protobuf/message_lite.h" // IWYU pragma: export #endif // CORE_INTERNAL_MESSAGE_LITE_H_ diff --git a/fastpair/analytics/BUILD b/fastpair/analytics/BUILD index d1f7f1cf..797b9d7f 100644 --- a/fastpair/analytics/BUILD +++ b/fastpair/analytics/BUILD @@ -29,7 +29,7 @@ cc_library( "//internal/analytics:event_logger", "//internal/proto/analytics:fast_pair_log_cc_proto", "//proto:fast_pair_enums_cc_proto", - "//third_party/protobuf:protobuf_lite", + "@com_google_protobuf//:protobuf_lite", ], ) @@ -41,8 +41,8 @@ cc_test( "//internal/analytics:event_logger", "//internal/proto/analytics:fast_pair_log_cc_proto", "//proto:fast_pair_enums_cc_proto", - "//third_party/protobuf:protobuf_lite", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", + "@com_google_protobuf//:protobuf_lite", ], ) diff --git a/fastpair/analytics/analytics_recorder.cc b/fastpair/analytics/analytics_recorder.cc index dfdeabb9..87977029 100644 --- a/fastpair/analytics/analytics_recorder.cc +++ b/fastpair/analytics/analytics_recorder.cc @@ -19,7 +19,7 @@ #include "internal/analytics/event_logger.h" #include "internal/proto/analytics/fast_pair_log.proto.h" #include "proto/fast_pair_enums.proto.h" -#include "third_party/protobuf/message_lite.h" +#include "google/protobuf/message_lite.h" namespace nearby { namespace fastpair { diff --git a/fastpair/analytics/analytics_recorder.h b/fastpair/analytics/analytics_recorder.h index dc8d7b92..fc575f49 100644 --- a/fastpair/analytics/analytics_recorder.h +++ b/fastpair/analytics/analytics_recorder.h @@ -20,7 +20,7 @@ #include "internal/analytics/event_logger.h" #include "internal/proto/analytics/fast_pair_log.proto.h" #include "proto/fast_pair_enums.proto.h" -#include "third_party/protobuf/message_lite.h" +#include "google/protobuf/message_lite.h" namespace nearby { namespace fastpair { diff --git a/fastpair/analytics/analytics_recorder_test.cc b/fastpair/analytics/analytics_recorder_test.cc index 4eb68d40..baa6eb24 100644 --- a/fastpair/analytics/analytics_recorder_test.cc +++ b/fastpair/analytics/analytics_recorder_test.cc @@ -22,7 +22,7 @@ #include "internal/analytics/event_logger.h" #include "internal/proto/analytics/fast_pair_log.proto.h" #include "proto/fast_pair_enums.proto.h" -#include "third_party/protobuf/message_lite.h" +#include "google/protobuf/message_lite.h" namespace nearby { namespace fastpair { diff --git a/internal/analytics/BUILD b/internal/analytics/BUILD index bc15387e..6e831f13 100644 --- a/internal/analytics/BUILD +++ b/internal/analytics/BUILD @@ -26,5 +26,5 @@ cc_library( "//location/nearby/cpp/sharing:__subpackages__", "//sharing:__subpackages__", ], - deps = ["@com_google_protobuf//:protobuf"], + deps = ["@com_google_protobuf//:protobuf_lite"], ) diff --git a/internal/data/BUILD b/internal/data/BUILD index a8342387..2ff9e133 100644 --- a/internal/data/BUILD +++ b/internal/data/BUILD @@ -17,11 +17,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", ], ) diff --git a/internal/data/leveldb_data_set.h b/internal/data/leveldb_data_set.h index 5ad4648c..5a27efef 100644 --- a/internal/data/leveldb_data_set.h +++ b/internal/data/leveldb_data_set.h @@ -30,7 +30,7 @@ #include "third_party/leveldb/include/status.h" #include "internal/data/data_set.h" #include "internal/platform/logging.h" -#include "third_party/protobuf/message_lite.h" +#include "google/protobuf/message_lite.h" namespace nearby { namespace data { diff --git a/internal/proto/analytics/BUILD b/internal/proto/analytics/BUILD index 904d2182..fcd46ccb 100644 --- a/internal/proto/analytics/BUILD +++ b/internal/proto/analytics/BUILD @@ -67,8 +67,8 @@ cc_test( "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep "//proto:connections_enums_cc_proto", + "//third_party/protobuf", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", - "@com_google_protobuf//:protobuf", ], )