diff --git a/README.md b/README.md index 4ef09f70..23cbc0b6 100644 --- a/README.md +++ b/README.md @@ -35,4 +35,4 @@ platform specific instructions. * [iOS](https://github.com/google/nearby/blob/master/docs/ios_build.md) -**Last Updated:** Dec 2021 +**Last Updated:** Jan 2022 diff --git a/cpp/analytics/analytics_recorder.cc b/cpp/analytics/analytics_recorder.cc index a79d8b08..7d27ce6e 100644 --- a/cpp/analytics/analytics_recorder.cc +++ b/cpp/analytics/analytics_recorder.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "analytics/analytics_recorder.h" +#include "third_party/nearby/cpp/analytics/analytics_recorder.h" #include #include diff --git a/cpp/analytics/analytics_recorder.h b/cpp/analytics/analytics_recorder.h index d58ea990..97e245bb 100644 --- a/cpp/analytics/analytics_recorder.h +++ b/cpp/analytics/analytics_recorder.h @@ -19,7 +19,7 @@ #include "absl/container/btree_map.h" #include "absl/time/time.h" -#include "analytics/connection_attempt_metadata_params.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" diff --git a/cpp/analytics/analytics_recorder_test.cc b/cpp/analytics/analytics_recorder_test.cc index ca612b2e..cce2f93b 100644 --- a/cpp/analytics/analytics_recorder_test.cc +++ b/cpp/analytics/analytics_recorder_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "analytics/analytics_recorder.h" +#include "third_party/nearby/cpp/analytics/analytics_recorder.h" #include #include @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "absl/time/time.h" -#include "analytics/connection_attempt_metadata_params.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" diff --git a/cpp/core/BUILD b/cpp/core/BUILD index 4588a291..cfac528d 100644 --- a/cpp/core/BUILD +++ b/cpp/core/BUILD @@ -59,7 +59,7 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform/impl/ios:__subpackages__", ], @@ -80,7 +80,7 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", ], deps = [ "//proto/analytics:connections_log_cc_proto", diff --git a/cpp/core/internal/BUILD b/cpp/core/internal/BUILD index 9247f02e..2b00c283 100644 --- a/cpp/core/internal/BUILD +++ b/cpp/core/internal/BUILD @@ -100,7 +100,7 @@ cc_library( "//absl/strings", "//absl/time", "//absl/types:span", - "//analytics", + "//third_party/nearby/cpp/analytics", "//core:core_types", "//core/internal/mediums", "//core/internal/mediums:utils", @@ -197,7 +197,7 @@ cc_test( "//absl/synchronization", "//absl/time", "//absl/types:span", - "//analytics", + "//third_party/nearby/cpp/analytics", "//core:core_types", "//core/internal/mediums", "//core/internal/mediums:utils", diff --git a/cpp/core/internal/base_endpoint_channel.h b/cpp/core/internal/base_endpoint_channel.h index 8f7ce633..b535d2d8 100644 --- a/cpp/core/internal/base_endpoint_channel.h +++ b/cpp/core/internal/base_endpoint_channel.h @@ -21,7 +21,7 @@ #include "securegcm/d2d_connection_context_v1.h" #include "absl/base/thread_annotations.h" -#include "analytics/analytics_recorder.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" diff --git a/cpp/core/internal/client_proxy.h b/cpp/core/internal/client_proxy.h index 242be92a..6a5a15b7 100644 --- a/cpp/core/internal/client_proxy.h +++ b/cpp/core/internal/client_proxy.h @@ -20,7 +20,7 @@ #include #include -#include "analytics/analytics_recorder.h" +#include "third_party/nearby/cpp/analytics/analytics_recorder.h" #include "core/listeners.h" #include "core/options.h" #include "core/status.h" diff --git a/cpp/core/internal/endpoint_channel.h b/cpp/core/internal/endpoint_channel.h index 7c21aeca..c08c8832 100644 --- a/cpp/core/internal/endpoint_channel.h +++ b/cpp/core/internal/endpoint_channel.h @@ -20,7 +20,7 @@ #include "securegcm/d2d_connection_context_v1.h" #include "absl/time/clock.h" -#include "analytics/analytics_recorder.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" diff --git a/cpp/platform/base/BUILD b/cpp/platform/base/BUILD index 9fa908b8..6ba997f1 100644 --- a/cpp/platform/base/BUILD +++ b/cpp/platform/base/BUILD @@ -44,7 +44,7 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//third_party/nearby/cpp/cal:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", @@ -140,7 +140,7 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//core/internal:__subpackages__", "//platform/impl:__subpackages__", ], diff --git a/cpp/platform/impl/g3/BUILD b/cpp/platform/impl/g3/BUILD index 50f1150e..0eda872b 100644 --- a/cpp/platform/impl/g3/BUILD +++ b/cpp/platform/impl/g3/BUILD @@ -109,7 +109,7 @@ cc_library( "platform.cc", ], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", "//proto/analytics:__subpackages__", diff --git a/cpp/platform/public/BUILD b/cpp/platform/public/BUILD index 086645b1..5c0b9509 100644 --- a/cpp/platform/public/BUILD +++ b/cpp/platform/public/BUILD @@ -52,7 +52,7 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform/base:__pkg__", "//platform/impl/ios:__subpackages__", @@ -90,7 +90,7 @@ cc_library( copts = ["-DCORE_ADAPTER_DLL"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform/public:__pkg__", ], @@ -116,7 +116,7 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", "//proto/analytics:__subpackages__", diff --git a/proto/analytics/BUILD b/proto/analytics/BUILD index dbd3ee60..e718ffd6 100644 --- a/proto/analytics/BUILD +++ b/proto/analytics/BUILD @@ -36,7 +36,7 @@ cc_proto_library( name = "connections_log_cc_proto", compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//analytics:__subpackages__", + "//third_party/nearby/cpp/analytics:__subpackages__", "//core:__subpackages__", ], deps = [":connections_log_proto"],