[Nearby Directory Refactoring] Move nearby/proto codes into the appropriate directories.

PiperOrigin-RevId: 421636973

cpp/core/BUILD

@@ -61,7 +61,7 @@ cc_library(
     visibility = [
         "//core:__subpackages__",
         "//platform/impl/ios:__subpackages__",
-        "//analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
     ],
     deps = [
         "//absl/strings",
@@ -80,10 +80,10 @@ cc_library(
     ],
     compatible_with = ["//buildenv/target:non_prod"],
     visibility = [
-        "//analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
     ],
     deps = [
-        "//proto/analytics:connections_log_cc_proto",
+        "//internal/proto/analytics:connections_log_cc_proto",
     ],
 )
 

cpp/core/event_logger.h

@@ -15,7 +15,7 @@
 #ifndef CORE_EVENT_LOGGER_H_
 #define CORE_EVENT_LOGGER_H_
 
-#include "proto/analytics/connections_log.pb.h"
+#include "internal/proto/analytics/connections_log.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/BUILD

@@ -100,6 +100,7 @@ cc_library(
         "//absl/strings",
         "//absl/time",
         "//absl/types:span",
+        "//connections/implementation/proto:offline_wire_formats_portable_proto",
         "//core:core_types",
         "//core/internal/mediums",
         "//core/internal/mediums:utils",
@@ -112,9 +113,8 @@ cc_library(
         "//platform/public:comm",
         "//platform/public:logging",
         "//platform/public:types",
-        "//analytics",
+        "//internal/analytics",
         "//proto:connections_enums_portable_proto",
-        "//proto/connections:offline_wire_formats_portable_proto",
         "//securegcm:ukey2",
     ],
 )
@@ -197,6 +197,7 @@ cc_test(
         "//absl/synchronization",
         "//absl/time",
         "//absl/types:span",
+        "//connections/implementation/proto:offline_wire_formats_portable_proto",
         "//core:core_types",
         "//core/internal/mediums",
         "//core/internal/mediums:utils",
@@ -206,9 +207,7 @@ cc_test(
         "//platform/public:comm",
         "//platform/public:logging",
         "//platform/public:types",
-        "//analytics",
         "//proto:connections_enums_portable_proto",
-        "//proto/connections:offline_wire_formats_portable_proto",
         "//securegcm:ukey2",
     ],
 )

cpp/core/internal/BUILD.bazel

@@ -101,6 +101,7 @@ cc_library(
         "//third_party/absl/strings",
         "//third_party/absl/time",
         "//third_party/absl/types:span",
+        "//third_party/nearby/connections/implementation/proto:offline_wire_formats_portable_proto",
         "//third_party/nearby/cpp/core:core_types",
         "//third_party/nearby/cpp/core/internal/mediums",
         "//third_party/nearby/cpp/core/internal/mediums:utils",
@@ -114,7 +115,6 @@ cc_library(
         "//third_party/nearby/cpp/platform/public:types",
         "//third_party/nearby/internal/analytics",
         "//third_party/nearby/proto:connections_enums_portable_proto",
-        "//third_party/nearby/proto/connections:offline_wire_formats_portable_proto",
         "//third_party/ukey2",
     ],
 )
@@ -199,6 +199,7 @@ cc_test(
         "//third_party/absl/synchronization",
         "//third_party/absl/time",
         "//third_party/absl/types:span",
+        "//third_party/nearby/connections/implementation/proto:offline_wire_formats_portable_proto",
         "//third_party/nearby/cpp/core:core_types",
         "//third_party/nearby/cpp/core/internal/mediums",
         "//third_party/nearby/cpp/core/internal/mediums:utils",
@@ -210,7 +211,6 @@ cc_test(
         "//third_party/nearby/cpp/platform/public:types",
         "//third_party/nearby/internal/analytics",
         "//third_party/nearby/proto:connections_enums_portable_proto",
-        "//third_party/nearby/proto/connections:offline_wire_formats_portable_proto",
         "//third_party/ukey2",
     ],
 )

cpp/core/internal/base_pcp_handler_test.cc

@@ -21,6 +21,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/time/time.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/base_endpoint_channel.h"
 #include "core/internal/bwu_manager.h"
 #include "core/internal/client_proxy.h"
@@ -34,7 +35,6 @@
 #include "platform/base/medium_environment.h"
 #include "platform/public/count_down_latch.h"
 #include "platform/public/pipe.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 #include "proto/connections_enums.pb.h"
 
 namespace location {

cpp/core/internal/endpoint_channel_manager.cc

@@ -19,13 +19,13 @@
 #include <utility>
 
 #include "absl/time/time.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/offline_frames.h"
 #include "platform/base/feature_flags.h"
 #include "platform/public/logging.h"
 #include "platform/public/mutex.h"
 #include "platform/public/mutex_lock.h"
 #include "platform/public/system_clock.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/endpoint_manager.cc

@@ -17,13 +17,13 @@
 #include <memory>
 #include <utility>
 
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/endpoint_channel.h"
 #include "core/internal/offline_frames.h"
 #include "platform/base/exception.h"
 #include "platform/public/count_down_latch.h"
 #include "platform/public/logging.h"
 #include "platform/public/mutex_lock.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/internal_payload_factory_test.cc

@@ -19,10 +19,10 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/offline_frames.h"
 #include "platform/base/byte_array.h"
 #include "platform/public/pipe.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/mediums/BUILD

@@ -49,6 +49,7 @@ cc_library(
         "//absl/strings",
         "//absl/strings:str_format",
         "//absl/time",
+        "//connections/implementation/proto:offline_wire_formats_portable_proto",
         "//core:core_types",
         "//core/internal/mediums/ble_v2",
         "//core/internal/mediums/webrtc",
@@ -58,7 +59,6 @@ cc_library(
         "//platform/public:comm",
         "//platform/public:logging",
         "//platform/public:types",
-        "//proto/connections:offline_wire_formats_portable_proto",
         "//proto/mediums:web_rtc_signaling_frames_cc_proto",
         "//smhasher:libmurmur3",
         "//webrtc/api:libjingle_peerconnection_api",
@@ -84,10 +84,10 @@ cc_library(
     ],
     deps = [
         "//absl/strings",
+        "//connections/implementation/proto:offline_wire_formats_portable_proto",
         "//core/internal/mediums/webrtc:data_types",
         "//platform/base",
         "//platform/public:types",
-        "//proto/connections:offline_wire_formats_portable_proto",
     ],
 )
 

cpp/core/internal/mediums/BUILD.bazel

@@ -50,6 +50,7 @@ cc_library(
         "//third_party/absl/strings",
         "//third_party/absl/strings:str_format",
         "//third_party/absl/time",
+        "//third_party/nearby/connections/implementation/proto:offline_wire_formats_portable_proto",
         "//third_party/nearby/cpp/core:core_types",
         "//third_party/nearby/cpp/core/internal/mediums/ble_v2",
         "//third_party/nearby/cpp/platform/base",
@@ -57,7 +58,6 @@ cc_library(
         "//third_party/nearby/cpp/platform/public:comm",
         "//third_party/nearby/cpp/platform/public:logging",
         "//third_party/nearby/cpp/platform/public:types",
-        "//third_party/nearby/proto/connections:offline_wire_formats_portable_proto",
         "//third_party/nearby/proto/mediums:web_rtc_signaling_frames_cc_proto",
         "//third_party/smhasher:libmurmur3",
     ],
@@ -82,9 +82,9 @@ cc_library(
     ],
     deps = [
         "//third_party/absl/strings",
+        "//third_party/nearby/connections/implementation/proto:offline_wire_formats_portable_proto",
         "//third_party/nearby/cpp/platform/base",
         "//third_party/nearby/cpp/platform/public:types",
-        "//third_party/nearby/proto/connections:offline_wire_formats_portable_proto",
     ],
 )
 

cpp/core/internal/mediums/utils.h

@@ -18,8 +18,8 @@
 #include <memory>
 #include <string>
 
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "platform/base/byte_array.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/mediums/webrtc.h

@@ -22,6 +22,7 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/mediums/webrtc/connection_flow.h"
 #include "core/internal/mediums/webrtc/data_channel_listener.h"
 #include "core/internal/mediums/webrtc/local_ice_candidate_listener.h"
@@ -39,7 +40,6 @@
 #include "platform/public/scheduled_executor.h"
 #include "platform/public/single_thread_executor.h"
 #include "platform/public/webrtc.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 #include "proto/mediums/web_rtc_signaling_frames.pb.h"
 #include "webrtc/api/jsep.h"
 

cpp/core/internal/mediums/webrtc_stub.h

@@ -20,11 +20,11 @@
 #include <memory>
 #include <string>
 
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/mediums/webrtc_peer_id.h"
 #include "core/internal/mediums/webrtc_socket_stub.h"
 #include "platform/base/cancellation_flag.h"
 #include "platform/base/listeners.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/offline_frames.h

@@ -18,10 +18,10 @@
 #include <cstdint>
 #include <vector>
 
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/options.h"
 #include "platform/base/byte_array.h"
 #include "platform/base/exception.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/offline_frames_test.cc

@@ -19,11 +19,11 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/strings/string_view.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "platform/base/byte_array.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/offline_frames_validator.cc

@@ -16,9 +16,9 @@
 
 #include <regex>  //NOLINT
 
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/internal_payload.h"
 #include "core/internal/offline_frames.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/offline_frames_validator.h

@@ -15,8 +15,8 @@
 #ifndef CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
 #define CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
 
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "platform/base/exception.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/offline_frames_validator_test.cc

@@ -16,12 +16,12 @@
 
 #include <string>
 
-#include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/strings/string_view.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "core/internal/offline_frames.h"
 #include "platform/base/byte_array.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 
 namespace location {
 namespace nearby {

cpp/platform/api/BUILD

@@ -71,9 +71,9 @@ cc_library(
     deps = [
         "//absl/strings",
         "//absl/types:optional",
+        "//connections/implementation/proto:offline_wire_formats_portable_proto",
         "//platform/base",
         "//platform/base:cancellation_flag",
-        "//proto/connections:offline_wire_formats_portable_proto",
         "//webrtc/api:libjingle_peerconnection_api",
     ],
 )

cpp/platform/api/webrtc.h

@@ -20,8 +20,8 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "platform/base/byte_array.h"
-#include "proto/connections/offline_wire_formats.pb.h"
 #include "webrtc/api/peer_connection_interface.h"
 
 namespace location {

cpp/platform/base/BUILD

@@ -48,8 +48,8 @@ cc_library(
         "//core:__subpackages__",
         "//platform:__subpackages__",
         "//platform/api:__subpackages__",
-        "//analytics:__subpackages__",
-        "//proto/analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
+        "//internal/proto/analytics:__subpackages__",
     ],
     deps = [
         "//absl/container:flat_hash_map",
@@ -142,7 +142,7 @@ cc_library(
     visibility = [
         "//core/internal:__subpackages__",
         "//platform/impl:__subpackages__",
-        "//analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
     ],
     deps = [
         ":logging",

cpp/platform/impl/g3/BUILD

@@ -111,8 +111,8 @@ cc_library(
     visibility = [
         "//core:__subpackages__",
         "//platform:__subpackages__",
-        "//analytics:__subpackages__",
-        "//proto/analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
+        "//internal/proto/analytics:__subpackages__",
     ],
     deps = [
         ":comm",

cpp/platform/impl/ios/Source/Mediums/BUILD

@@ -51,6 +51,6 @@ objc_proto_library(
 proto_library(
     name = "Protos",
     deps = [
-        "//proto/connections:offline_wire_formats_proto",
+        "//connections/implementation/proto:offline_wire_formats_proto",
     ],
 )

cpp/platform/public/BUILD

@@ -57,7 +57,7 @@ cc_library(
         "//platform/impl/ios:__subpackages__",
         "//platform/impl/windows:__subpackages__",
         "//platform/public:__pkg__",
-        "//analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
     ],
     deps = [
         ":logging",
@@ -92,7 +92,7 @@ cc_library(
         "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__",
         "//core:__subpackages__",
         "//platform/public:__pkg__",
-        "//analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
     ],
     deps = [
         ":logging",
@@ -103,7 +103,6 @@ cc_library(
         "//platform/api:platform",
         "//platform/base",
         "//platform/base:cancellation_flag",
-        "//proto/connections:offline_wire_formats_portable_proto",
         "//webrtc/api:libjingle_peerconnection_api",
     ],
 )
@@ -118,8 +117,8 @@ cc_library(
     visibility = [
         "//core:__subpackages__",
         "//platform:__subpackages__",
-        "//analytics:__subpackages__",
-        "//proto/analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
+        "//internal/proto/analytics:__subpackages__",
     ],
     deps = [
         "//platform/base:logging",

internal/analytics/BUILD

@@ -26,7 +26,7 @@ cc_library(
     copts = ["-DCORE_ADAPTER_DLL"],
     visibility = [
         "//core:__subpackages__",
-        "//proto/analytics:__subpackages__",
+        "//internal/proto/analytics:__subpackages__",
     ],
     deps = [
         "//absl/container:btree",
@@ -37,8 +37,8 @@ cc_library(
         "//platform/base:error_code_recorder",
         "//platform/public:logging",
         "//platform/public:types",
+        "//internal/proto/analytics:connections_log_cc_proto",
         "//proto:connections_enums_portable_proto",
-        "//proto/analytics:connections_log_cc_proto",
         "//proto/errorcode:error_code_enums_portable_proto",
     ],
 )
@@ -59,7 +59,7 @@ cc_test(
         "//platform/public:comm",
         "//platform/public:logging",
         "//platform/public:types",
+        "//internal/proto/analytics:connections_log_cc_proto",
         "//proto:connections_enums_portable_proto",
-        "//proto/analytics:connections_log_cc_proto",
     ],
 )

internal/analytics/analytics_recorder.cc

@@ -21,7 +21,7 @@
 #include "platform/public/logging.h"
 #include "platform/public/mutex_lock.h"
 #include "platform/public/system_clock.h"
-#include "proto/analytics/connections_log.pb.h"
+#include "internal/proto/analytics/connections_log.pb.h"
 #include "proto/connections_enums.pb.h"
 
 namespace location {

internal/analytics/analytics_recorder.h

@@ -26,7 +26,7 @@
 #include "platform/public/mutex.h"
 #include "platform/public/single_thread_executor.h"
 #include "internal/analytics/connection_attempt_metadata_params.h"
-#include "proto/analytics/connections_log.pb.h"
+#include "internal/proto/analytics/connections_log.pb.h"
 #include "proto/connections_enums.pb.h"
 
 namespace location {

internal/analytics/analytics_recorder_test.cc

@@ -25,7 +25,7 @@
 #include "platform/public/count_down_latch.h"
 #include "platform/public/logging.h"
 #include "internal/analytics/connection_attempt_metadata_params.h"
-#include "proto/analytics/connections_log.pb.h"
+#include "internal/proto/analytics/connections_log.pb.h"
 #include "proto/connections_enums.pb.h"
 
 namespace location {

internal/proto/analytics/BUILD

@@ -37,7 +37,7 @@ cc_proto_library(
     compatible_with = ["//buildenv/target:non_prod"],
     visibility = [
         "//core:__subpackages__",
-        "//analytics:__subpackages__",
+        "//internal/analytics:__subpackages__",
     ],
     deps = [":connections_log_proto"],
 )
@@ -59,7 +59,6 @@ cc_test(
         
         "//net/proto2/public",
         "//testing/base/public:gunit_main",
-        "//platform/base",
         "//platform/impl/g3",  # build_cleaner: keep
         "//platform/public:logging",
         "//proto:connections_enums_portable_proto",

internal/proto/analytics/connections_log_test.cc

@@ -16,7 +16,7 @@
 #include "google/protobuf/descriptor.h"
 #include "gtest/gtest.h"
 #include "platform/public/logging.h"
-#include "proto/analytics/connections_log.pb.h"
+#include "internal/proto/analytics/connections_log.pb.h"
 #include "proto/connections_enums.pb.h"
 
 namespace location {

proto/connections_enums.proto

@@ -86,7 +86,7 @@ enum Medium {
 // LINT.ThenChange(
 //     //depot/google3/java/com/google/android/gmscore/integ/client/nearby/src/com/google/android/gms/nearby/connection/Medium.java,
 //     //depot/google3/java/com/google/android/gms/nearby/internal/connection/api.proto,
-//     //depot/google3/third_party/nearby/proto/connections/offline_wire_formats.proto
+//     //depot/google3/third_party/nearby/connections/implementation/proto/offline_wire_formats.proto
 // )
 
 // The medium technologies used during the sharing.