From acc6f2de9ab889a212597be228bb45351e457b95 Mon Sep 17 00:00:00 2001 From: suetfei Date: Thu, 6 Jan 2022 13:46:51 -0800 Subject: [PATCH] Move third_party/nearby/cpp/analytics to third_party/nearby/internal/analytics. PiperOrigin-RevId: 420135432 --- cpp/core/BUILD | 4 ++-- cpp/core/internal/BUILD | 4 ++-- cpp/core/internal/BUILD.bazel | 4 ++-- cpp/core/internal/base_endpoint_channel.h | 2 +- cpp/core/internal/client_proxy.h | 2 +- cpp/core/internal/endpoint_channel.h | 2 +- cpp/platform/base/BUILD | 4 ++-- cpp/platform/impl/g3/BUILD | 2 +- cpp/platform/public/BUILD | 6 +++--- {cpp => internal}/analytics/BUILD | 0 {cpp => internal}/analytics/analytics_recorder.cc | 2 +- {cpp => internal}/analytics/analytics_recorder.h | 2 +- {cpp => internal}/analytics/analytics_recorder_test.cc | 4 ++-- .../analytics/connection_attempt_metadata_params.h | 0 proto/analytics/BUILD | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) rename {cpp => internal}/analytics/BUILD (100%) rename {cpp => internal}/analytics/analytics_recorder.cc (99%) rename {cpp => internal}/analytics/analytics_recorder.h (99%) rename {cpp => internal}/analytics/analytics_recorder_test.cc (99%) rename {cpp => internal}/analytics/connection_attempt_metadata_params.h (100%) diff --git a/cpp/core/BUILD b/cpp/core/BUILD index cfac528d..157de1db 100644 --- a/cpp/core/BUILD +++ b/cpp/core/BUILD @@ -59,9 +59,9 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform/impl/ios:__subpackages__", + "//analytics:__subpackages__", ], deps = [ "//absl/strings", @@ -80,7 +80,7 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", ], deps = [ "//proto/analytics:connections_log_cc_proto", diff --git a/cpp/core/internal/BUILD b/cpp/core/internal/BUILD index 2b00c283..f38a58d2 100644 --- a/cpp/core/internal/BUILD +++ b/cpp/core/internal/BUILD @@ -100,7 +100,6 @@ cc_library( "//absl/strings", "//absl/time", "//absl/types:span", - "//third_party/nearby/cpp/analytics", "//core:core_types", "//core/internal/mediums", "//core/internal/mediums:utils", @@ -113,6 +112,7 @@ cc_library( "//platform/public:comm", "//platform/public:logging", "//platform/public:types", + "//analytics", "//proto:connections_enums_portable_proto", "//proto/connections:offline_wire_formats_portable_proto", "//securegcm:ukey2", @@ -197,7 +197,6 @@ cc_test( "//absl/synchronization", "//absl/time", "//absl/types:span", - "//third_party/nearby/cpp/analytics", "//core:core_types", "//core/internal/mediums", "//core/internal/mediums:utils", @@ -207,6 +206,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 5472229d..3006be49 100644 --- a/cpp/core/internal/BUILD.bazel +++ b/cpp/core/internal/BUILD.bazel @@ -101,7 +101,6 @@ cc_library( "//third_party/absl/strings", "//third_party/absl/time", "//third_party/absl/types:span", - "//third_party/nearby/cpp/analytics", "//third_party/nearby/cpp/core:core_types", "//third_party/nearby/cpp/core/internal/mediums", "//third_party/nearby/cpp/core/internal/mediums:utils", @@ -113,6 +112,7 @@ 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/internal/analytics", "//third_party/nearby/proto:connections_enums_portable_proto", "//third_party/nearby/proto/connections:offline_wire_formats_portable_proto", "//third_party/ukey2", @@ -199,7 +199,6 @@ cc_test( "//third_party/absl/synchronization", "//third_party/absl/time", "//third_party/absl/types:span", - "//third_party/nearby/cpp/analytics", "//third_party/nearby/cpp/core:core_types", "//third_party/nearby/cpp/core/internal/mediums", "//third_party/nearby/cpp/core/internal/mediums:utils", @@ -209,6 +208,7 @@ cc_test( "//third_party/nearby/cpp/platform/public:comm", "//third_party/nearby/cpp/platform/public:logging", "//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_endpoint_channel.h b/cpp/core/internal/base_endpoint_channel.h index b535d2d8..da6fabf3 100644 --- a/cpp/core/internal/base_endpoint_channel.h +++ b/cpp/core/internal/base_endpoint_channel.h @@ -21,7 +21,6 @@ #include "securegcm/d2d_connection_context_v1.h" #include "absl/base/thread_annotations.h" -#include "third_party/nearby/cpp/analytics/analytics_recorder.h" #include "core/internal/endpoint_channel.h" #include "platform/base/byte_array.h" #include "platform/base/input_stream.h" @@ -30,6 +29,7 @@ #include "platform/public/condition_variable.h" #include "platform/public/mutex.h" #include "platform/public/system_clock.h" +#include "analytics/analytics_recorder.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/client_proxy.h b/cpp/core/internal/client_proxy.h index 6a5a15b7..7522b10a 100644 --- a/cpp/core/internal/client_proxy.h +++ b/cpp/core/internal/client_proxy.h @@ -20,7 +20,6 @@ #include #include -#include "third_party/nearby/cpp/analytics/analytics_recorder.h" #include "core/listeners.h" #include "core/options.h" #include "core/status.h" @@ -31,6 +30,7 @@ #include "platform/base/prng.h" #include "platform/public/cancelable_alarm.h" #include "platform/public/mutex.h" +#include "analytics/analytics_recorder.h" // Prefer using absl:: versions of a set and a map; they tend to be more // efficient: implementation is using open-addressing hash tables. #include "absl/container/flat_hash_map.h" diff --git a/cpp/core/internal/endpoint_channel.h b/cpp/core/internal/endpoint_channel.h index c08c8832..b474aeee 100644 --- a/cpp/core/internal/endpoint_channel.h +++ b/cpp/core/internal/endpoint_channel.h @@ -20,10 +20,10 @@ #include "securegcm/d2d_connection_context_v1.h" #include "absl/time/clock.h" -#include "third_party/nearby/cpp/analytics/analytics_recorder.h" #include "platform/base/byte_array.h" #include "platform/base/exception.h" #include "platform/public/mutex.h" +#include "analytics/analytics_recorder.h" #include "proto/connections_enums.pb.h" namespace location { diff --git a/cpp/platform/base/BUILD b/cpp/platform/base/BUILD index 6ba997f1..3313bf9c 100644 --- a/cpp/platform/base/BUILD +++ b/cpp/platform/base/BUILD @@ -44,11 +44,11 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", "//third_party/nearby/cpp/cal:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", "//platform/api:__subpackages__", + "//analytics:__subpackages__", "//proto/analytics:__subpackages__", ], deps = [ @@ -140,9 +140,9 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", "//core/internal:__subpackages__", "//platform/impl:__subpackages__", + "//analytics:__subpackages__", ], deps = [ ":logging", diff --git a/cpp/platform/impl/g3/BUILD b/cpp/platform/impl/g3/BUILD index 0eda872b..292c77c1 100644 --- a/cpp/platform/impl/g3/BUILD +++ b/cpp/platform/impl/g3/BUILD @@ -109,9 +109,9 @@ cc_library( "platform.cc", ], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", + "//analytics:__subpackages__", "//proto/analytics:__subpackages__", ], deps = [ diff --git a/cpp/platform/public/BUILD b/cpp/platform/public/BUILD index 5c0b9509..b7b5fde6 100644 --- a/cpp/platform/public/BUILD +++ b/cpp/platform/public/BUILD @@ -52,12 +52,12 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform/base:__pkg__", "//platform/impl/ios:__subpackages__", "//platform/impl/windows:__subpackages__", "//platform/public:__pkg__", + "//analytics:__subpackages__", ], deps = [ ":logging", @@ -90,9 +90,9 @@ cc_library( copts = ["-DCORE_ADAPTER_DLL"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform/public:__pkg__", + "//analytics:__subpackages__", ], deps = [ ":logging", @@ -116,9 +116,9 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", + "//analytics:__subpackages__", "//proto/analytics:__subpackages__", ], deps = [ diff --git a/cpp/analytics/BUILD b/internal/analytics/BUILD similarity index 100% rename from cpp/analytics/BUILD rename to internal/analytics/BUILD diff --git a/cpp/analytics/analytics_recorder.cc b/internal/analytics/analytics_recorder.cc similarity index 99% rename from cpp/analytics/analytics_recorder.cc rename to internal/analytics/analytics_recorder.cc index 7d27ce6e..a79d8b08 100644 --- a/cpp/analytics/analytics_recorder.cc +++ b/internal/analytics/analytics_recorder.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/cpp/analytics/analytics_recorder.h" +#include "analytics/analytics_recorder.h" #include #include diff --git a/cpp/analytics/analytics_recorder.h b/internal/analytics/analytics_recorder.h similarity index 99% rename from cpp/analytics/analytics_recorder.h rename to internal/analytics/analytics_recorder.h index 97e245bb..91c38a3c 100644 --- a/cpp/analytics/analytics_recorder.h +++ b/internal/analytics/analytics_recorder.h @@ -19,13 +19,13 @@ #include "absl/container/btree_map.h" #include "absl/time/time.h" -#include "third_party/nearby/cpp/analytics/connection_attempt_metadata_params.h" #include "core/event_logger.h" #include "core/payload.h" #include "core/strategy.h" #include "platform/base/error_code_params.h" #include "platform/public/mutex.h" #include "platform/public/single_thread_executor.h" +#include "analytics/connection_attempt_metadata_params.h" #include "proto/analytics/connections_log.pb.h" #include "proto/connections_enums.pb.h" diff --git a/cpp/analytics/analytics_recorder_test.cc b/internal/analytics/analytics_recorder_test.cc similarity index 99% rename from cpp/analytics/analytics_recorder_test.cc rename to internal/analytics/analytics_recorder_test.cc index cce2f93b..3239ec40 100644 --- a/cpp/analytics/analytics_recorder_test.cc +++ b/internal/analytics/analytics_recorder_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/cpp/analytics/analytics_recorder.h" +#include "analytics/analytics_recorder.h" #include #include @@ -20,11 +20,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "absl/time/time.h" -#include "third_party/nearby/cpp/analytics/connection_attempt_metadata_params.h" #include "platform/base/error_code_params.h" #include "platform/base/error_code_recorder.h" #include "platform/public/count_down_latch.h" #include "platform/public/logging.h" +#include "analytics/connection_attempt_metadata_params.h" #include "proto/analytics/connections_log.pb.h" #include "proto/connections_enums.pb.h" diff --git a/cpp/analytics/connection_attempt_metadata_params.h b/internal/analytics/connection_attempt_metadata_params.h similarity index 100% rename from cpp/analytics/connection_attempt_metadata_params.h rename to internal/analytics/connection_attempt_metadata_params.h diff --git a/proto/analytics/BUILD b/proto/analytics/BUILD index e718ffd6..744c2c2f 100644 --- a/proto/analytics/BUILD +++ b/proto/analytics/BUILD @@ -36,8 +36,8 @@ cc_proto_library( name = "connections_log_cc_proto", compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", + "//analytics:__subpackages__", ], deps = [":connections_log_proto"], )