diff --git a/proto/connections/BUILD b/connections/implementation/proto/BUILD similarity index 100% rename from proto/connections/BUILD rename to connections/implementation/proto/BUILD diff --git a/proto/connections/CMakeLists.txt b/connections/implementation/proto/CMakeLists.txt similarity index 100% rename from proto/connections/CMakeLists.txt rename to connections/implementation/proto/CMakeLists.txt diff --git a/proto/connections/offline_wire_formats.proto b/connections/implementation/proto/offline_wire_formats.proto similarity index 100% rename from proto/connections/offline_wire_formats.proto rename to connections/implementation/proto/offline_wire_formats.proto diff --git a/proto/connections/offline_wire_formats_proto_config.asciipb b/connections/implementation/proto/offline_wire_formats_proto_config.asciipb similarity index 100% rename from proto/connections/offline_wire_formats_proto_config.asciipb rename to connections/implementation/proto/offline_wire_formats_proto_config.asciipb diff --git a/cpp/core/BUILD b/cpp/core/BUILD index 157de1db..80133bb1 100644 --- a/cpp/core/BUILD +++ b/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", ], ) diff --git a/cpp/core/event_logger.h b/cpp/core/event_logger.h index 3602c5a5..78894097 100644 --- a/cpp/core/event_logger.h +++ b/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 { diff --git a/cpp/core/internal/BUILD b/cpp/core/internal/BUILD index f38a58d2..1927b1aa 100644 --- a/cpp/core/internal/BUILD +++ b/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", ], ) diff --git a/cpp/core/internal/BUILD.bazel b/cpp/core/internal/BUILD.bazel index 3006be49..308fb525 100644 --- a/cpp/core/internal/BUILD.bazel +++ b/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", ], ) diff --git a/cpp/core/internal/base_pcp_handler_test.cc b/cpp/core/internal/base_pcp_handler_test.cc index b916cbf3..6881c7b5 100644 --- a/cpp/core/internal/base_pcp_handler_test.cc +++ b/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 { diff --git a/cpp/core/internal/endpoint_channel_manager.cc b/cpp/core/internal/endpoint_channel_manager.cc index 55cead7e..bbdee79e 100644 --- a/cpp/core/internal/endpoint_channel_manager.cc +++ b/cpp/core/internal/endpoint_channel_manager.cc @@ -19,13 +19,13 @@ #include #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 { diff --git a/cpp/core/internal/endpoint_manager.cc b/cpp/core/internal/endpoint_manager.cc index e050b9f4..d4df32e2 100644 --- a/cpp/core/internal/endpoint_manager.cc +++ b/cpp/core/internal/endpoint_manager.cc @@ -17,13 +17,13 @@ #include #include +#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 { diff --git a/cpp/core/internal/internal_payload_factory_test.cc b/cpp/core/internal/internal_payload_factory_test.cc index adfbe9b2..53cb79e7 100644 --- a/cpp/core/internal/internal_payload_factory_test.cc +++ b/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 { diff --git a/cpp/core/internal/mediums/BUILD b/cpp/core/internal/mediums/BUILD index 685f1f2e..3fbcd648 100644 --- a/cpp/core/internal/mediums/BUILD +++ b/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", ], ) diff --git a/cpp/core/internal/mediums/BUILD.bazel b/cpp/core/internal/mediums/BUILD.bazel index 71059c38..055e9c4b 100644 --- a/cpp/core/internal/mediums/BUILD.bazel +++ b/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", ], ) diff --git a/cpp/core/internal/mediums/utils.h b/cpp/core/internal/mediums/utils.h index 4a26c4e8..6346a3e7 100644 --- a/cpp/core/internal/mediums/utils.h +++ b/cpp/core/internal/mediums/utils.h @@ -18,8 +18,8 @@ #include #include +#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 { diff --git a/cpp/core/internal/mediums/webrtc.h b/cpp/core/internal/mediums/webrtc.h index ccc6b5d5..bc9ef58c 100644 --- a/cpp/core/internal/mediums/webrtc.h +++ b/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" diff --git a/cpp/core/internal/mediums/webrtc_stub.h b/cpp/core/internal/mediums/webrtc_stub.h index 2dc8a69e..a2805d6c 100644 --- a/cpp/core/internal/mediums/webrtc_stub.h +++ b/cpp/core/internal/mediums/webrtc_stub.h @@ -20,11 +20,11 @@ #include #include +#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 { diff --git a/cpp/core/internal/offline_frames.h b/cpp/core/internal/offline_frames.h index 74db1071..a7dc878d 100644 --- a/cpp/core/internal/offline_frames.h +++ b/cpp/core/internal/offline_frames.h @@ -18,10 +18,10 @@ #include #include +#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 { diff --git a/cpp/core/internal/offline_frames_test.cc b/cpp/core/internal/offline_frames_test.cc index 3be49db1..d40b7b63 100644 --- a/cpp/core/internal/offline_frames_test.cc +++ b/cpp/core/internal/offline_frames_test.cc @@ -19,11 +19,11 @@ #include #include -#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 { diff --git a/cpp/core/internal/offline_frames_validator.cc b/cpp/core/internal/offline_frames_validator.cc index 614c65f8..fee09cb8 100644 --- a/cpp/core/internal/offline_frames_validator.cc +++ b/cpp/core/internal/offline_frames_validator.cc @@ -16,9 +16,9 @@ #include //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 { diff --git a/cpp/core/internal/offline_frames_validator.h b/cpp/core/internal/offline_frames_validator.h index f64c32c3..f8775405 100644 --- a/cpp/core/internal/offline_frames_validator.h +++ b/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 { diff --git a/cpp/core/internal/offline_frames_validator_test.cc b/cpp/core/internal/offline_frames_validator_test.cc index 3136fb2d..69c10901 100644 --- a/cpp/core/internal/offline_frames_validator_test.cc +++ b/cpp/core/internal/offline_frames_validator_test.cc @@ -16,12 +16,12 @@ #include -#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 { diff --git a/cpp/platform/api/BUILD b/cpp/platform/api/BUILD index 0b6678c9..bd90f0be 100644 --- a/cpp/platform/api/BUILD +++ b/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", ], ) diff --git a/cpp/platform/api/webrtc.h b/cpp/platform/api/webrtc.h index ede07072..990099fc 100644 --- a/cpp/platform/api/webrtc.h +++ b/cpp/platform/api/webrtc.h @@ -20,8 +20,8 @@ #include #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 { diff --git a/cpp/platform/base/BUILD b/cpp/platform/base/BUILD index 3313bf9c..15ca8883 100644 --- a/cpp/platform/base/BUILD +++ b/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", diff --git a/cpp/platform/impl/g3/BUILD b/cpp/platform/impl/g3/BUILD index 292c77c1..12cce01d 100644 --- a/cpp/platform/impl/g3/BUILD +++ b/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", diff --git a/cpp/platform/impl/ios/Source/Mediums/BUILD b/cpp/platform/impl/ios/Source/Mediums/BUILD index 882f6ed5..964cff52 100644 --- a/cpp/platform/impl/ios/Source/Mediums/BUILD +++ b/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", ], ) diff --git a/cpp/platform/public/BUILD b/cpp/platform/public/BUILD index b7b5fde6..402b84b4 100644 --- a/cpp/platform/public/BUILD +++ b/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", diff --git a/internal/analytics/BUILD b/internal/analytics/BUILD index 6f0d459e..76b249e0 100644 --- a/internal/analytics/BUILD +++ b/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", ], ) diff --git a/internal/analytics/analytics_recorder.cc b/internal/analytics/analytics_recorder.cc index 8c757b71..9bcec57f 100644 --- a/internal/analytics/analytics_recorder.cc +++ b/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 { diff --git a/internal/analytics/analytics_recorder.h b/internal/analytics/analytics_recorder.h index 8ce70854..064cc5c5 100644 --- a/internal/analytics/analytics_recorder.h +++ b/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 { diff --git a/internal/analytics/analytics_recorder_test.cc b/internal/analytics/analytics_recorder_test.cc index c2053eec..14c385e6 100644 --- a/internal/analytics/analytics_recorder_test.cc +++ b/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 { diff --git a/proto/analytics/BUILD b/internal/proto/analytics/BUILD similarity index 96% rename from proto/analytics/BUILD rename to internal/proto/analytics/BUILD index 744c2c2f..fcb8e7e6 100644 --- a/proto/analytics/BUILD +++ b/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", diff --git a/proto/analytics/connections_log.proto b/internal/proto/analytics/connections_log.proto similarity index 100% rename from proto/analytics/connections_log.proto rename to internal/proto/analytics/connections_log.proto diff --git a/proto/analytics/connections_log_test.cc b/internal/proto/analytics/connections_log_test.cc similarity index 98% rename from proto/analytics/connections_log_test.cc rename to internal/proto/analytics/connections_log_test.cc index 6e05f9b6..971ba5e4 100644 --- a/proto/analytics/connections_log_test.cc +++ b/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 { diff --git a/proto/connections_enums.proto b/proto/connections_enums.proto index dec1481a..9384440f 100644 --- a/proto/connections_enums.proto +++ b/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.