From 55f20775d209871190580f0ef461ae1c816b1870 Mon Sep 17 00:00:00 2001 From: Suet-Fei Li Date: Tue, 9 Aug 2022 12:00:16 -0700 Subject: [PATCH] Fix internal flow PiperOrigin-RevId: 466426960 --- internal/platform/BUILD | 8 ++++---- internal/platform/implementation/BUILD | 10 +++++----- .../implementation/credential_storage.h | 4 ++-- internal/platform/implementation/g3/BUILD | 2 +- presence/BUILD | 10 +++++----- presence/action_factory.cc | 2 +- presence/action_factory.h | 4 ++-- presence/action_factory_test.cc | 6 +++--- presence/advertisement_factory.cc | 4 ++-- presence/advertisement_factory.h | 6 +++--- presence/advertisement_factory_test.cc | 8 ++++---- presence/broadcast_options_test.cc | 2 +- presence/broadcast_request.cc | 6 +++--- presence/broadcast_request.h | 2 +- presence/broadcast_request_test.cc | 2 +- presence/certificate_manager.h | 2 +- presence/credential_test.cc | 2 +- presence/device_motion.cc | 2 +- presence/device_motion_test.cc | 2 +- presence/discovery_filter.cc | 2 +- presence/discovery_filter.h | 6 +++--- presence/discovery_filter_test.cc | 2 +- presence/discovery_options_test.cc | 2 +- presence/encryption.cc | 2 +- presence/encryption_test.cc | 2 +- presence/implementation/BUILD | 20 +++++++++---------- .../implementation/advertisement_decoder.cc | 6 +++--- .../implementation/advertisement_decoder.h | 8 ++++---- .../advertisement_decoder_test.cc | 6 +++--- presence/implementation/broadcast_manager.h | 4 ++-- presence/implementation/credential_manager.h | 4 ++-- .../implementation/credential_manager_impl.cc | 4 ++-- .../implementation/credential_manager_impl.h | 6 +++--- .../credential_manager_impl_test.cc | 4 ++-- presence/implementation/mediums/BUILD | 2 +- presence/implementation/mediums/mediums.h | 2 +- .../implementation/mock_service_controller.h | 2 +- presence/implementation/scan_manager.h | 4 ++-- .../implementation/service_controller_impl.h | 6 +++--- presence/listeners.h | 2 +- presence/presence_action.cc | 2 +- presence/presence_action_test.cc | 2 +- presence/presence_client.cc | 4 ++-- presence/presence_client.h | 10 +++++----- presence/presence_client_test.cc | 2 +- presence/presence_device.cc | 2 +- presence/presence_device_test.cc | 2 +- presence/presence_identity.cc | 2 +- presence/presence_identity_test.cc | 2 +- presence/presence_service.h | 2 +- presence/presence_service_test.cc | 2 +- presence/presence_zone.cc | 2 +- presence/presence_zone.h | 2 +- presence/presence_zone_test.cc | 4 ++-- presence/scan_request.h | 8 ++++---- presence/scan_request_builder.cc | 4 ++-- presence/scan_request_builder.h | 8 ++++---- presence/scan_request_builder_test.cc | 8 ++++---- presence/status_test.cc | 2 +- 59 files changed, 125 insertions(+), 125 deletions(-) diff --git a/internal/platform/BUILD b/internal/platform/BUILD index 40e1d4a2..dbc06cb8 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -53,8 +53,8 @@ cc_library( "//internal/platform/implementation:__subpackages__", "//internal/proto/analytics:__subpackages__", "//location/nearby/cpp/sharing:__subpackages__", + "//presence:__subpackages__", "//third_party/nearby/cpp/cal:__subpackages__", - "//third_party/nearby/presence:__subpackages__", ], deps = [ "//proto:connections_enums_cc_proto", @@ -109,7 +109,7 @@ cc_library( "//internal/platform:__subpackages__", "//internal/proto/analytics:__subpackages__", "//location/nearby/analytics/cpp:__subpackages__", - "//third_party/nearby/presence:__subpackages__", + "//presence:__subpackages__", ], deps = [ "//internal/platform/implementation:platform", @@ -176,7 +176,7 @@ cc_library( "//connections/implementation:__subpackages__", "//internal/platform:__pkg__", "//internal/platform/implementation:__subpackages__", - "//third_party/nearby/presence:__pkg__", + "//presence:__pkg__", ], deps = [ "//internal/platform/implementation:types", @@ -359,7 +359,7 @@ cc_library( "//internal/analytics:__subpackages__", "//internal/platform:__pkg__", "//internal/platform/implementation:__subpackages__", - "//third_party/nearby/presence:__subpackages__", + "//presence:__subpackages__", ], deps = [ ":logging", diff --git a/internal/platform/implementation/BUILD b/internal/platform/implementation/BUILD index aca75f6d..94e35c44 100644 --- a/internal/platform/implementation/BUILD +++ b/internal/platform/implementation/BUILD @@ -40,7 +40,7 @@ cc_library( "//internal/platform:__pkg__", "//internal/platform/implementation:__subpackages__", "//location/nearby/analytics/cpp:__subpackages__", - "//third_party/nearby/presence:__subpackages__", + "//presence:__subpackages__", ], deps = [ "//connections/clients/windows:types", @@ -69,16 +69,16 @@ cc_library( "//connections/implementation:__subpackages__", "//internal/platform:__pkg__", "//internal/platform/implementation:__subpackages__", - "//third_party/nearby/presence:__pkg__", - "//third_party/nearby/presence/implementation:__pkg__", + "//presence:__pkg__", + "//presence/implementation:__pkg__", ], deps = [ "//connections/implementation/proto:offline_wire_formats_cc_proto", "//internal/platform:base", "//internal/platform:cancellation_flag", "//internal/platform:uuid", - "//third_party/nearby/presence:credential", - "//third_party/nearby/presence/proto:credential_cc_proto", + "//presence:credential", + "//presence/proto:credential_cc_proto", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/strings", ], diff --git a/internal/platform/implementation/credential_storage.h b/internal/platform/implementation/credential_storage.h index 8cd67f73..a9362c52 100644 --- a/internal/platform/implementation/credential_storage.h +++ b/internal/platform/implementation/credential_storage.h @@ -21,8 +21,8 @@ #include #include "internal/platform/exception.h" -#include "third_party/nearby/presence/presence_identity.h" -#include "third_party/nearby/presence/proto/credential.pb.h" +#include "presence/presence_identity.h" +#include "presence/proto/credential.pb.h" namespace location { namespace nearby { diff --git a/internal/platform/implementation/g3/BUILD b/internal/platform/implementation/g3/BUILD index b2f46928..70048f2b 100644 --- a/internal/platform/implementation/g3/BUILD +++ b/internal/platform/implementation/g3/BUILD @@ -116,7 +116,7 @@ cc_library( "//internal/platform:__subpackages__", "//internal/proto/analytics:__subpackages__", "//location/nearby/cpp/sharing:__subpackages__", - "//third_party/nearby/presence:__subpackages__", + "//presence:__subpackages__", ], deps = [ ":comm", diff --git a/presence/BUILD b/presence/BUILD index bbcf5a7e..c85d62cd 100644 --- a/presence/BUILD +++ b/presence/BUILD @@ -26,7 +26,7 @@ cc_library( ], deps = [ ":types", - "//third_party/nearby/presence/implementation:internal", # build_cleaner: keep + "//presence/implementation:internal", # build_cleaner: keep ], ) @@ -61,7 +61,7 @@ cc_library( ":credential", "//net/proto2/util/public:differencer", "//internal/platform:base", - "//third_party/nearby/presence/proto:credential_cc_proto", + "//presence/proto:credential_cc_proto", "@com_google_absl//absl/strings", "@com_google_glog//:glog", ], @@ -147,8 +147,8 @@ cc_library( "//third_party/nearby:__subpackages__", ], deps = [ - "//third_party/nearby/presence/proto:credential_cc_proto", - "//third_party/nearby/presence/proto:device_metadata_cc_proto", + "//presence/proto:credential_cc_proto", + "//presence/proto:device_metadata_cc_proto", ], ) @@ -247,7 +247,7 @@ cc_test( ":credential", "//internal/platform:uuid", "//internal/platform/implementation/g3", # build_cleaner: keep - "//third_party/nearby/presence/proto:credential_cc_proto", + "//presence/proto:credential_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/presence/action_factory.cc b/presence/action_factory.cc index 32274f1e..8667d3b8 100644 --- a/presence/action_factory.cc +++ b/presence/action_factory.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/action_factory.h" +#include "presence/action_factory.h" #include #include diff --git a/presence/action_factory.h b/presence/action_factory.h index dbb1bff9..8e162387 100644 --- a/presence/action_factory.h +++ b/presence/action_factory.h @@ -17,8 +17,8 @@ #include -#include "third_party/nearby/presence/broadcast_request.h" -#include "third_party/nearby/presence/data_element.h" +#include "presence/broadcast_request.h" +#include "presence/data_element.h" namespace nearby { namespace presence { diff --git a/presence/action_factory_test.cc b/presence/action_factory_test.cc index d3cdebcf..3204162e 100644 --- a/presence/action_factory_test.cc +++ b/presence/action_factory_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/action_factory.h" +#include "presence/action_factory.h" #include #include @@ -21,8 +21,8 @@ #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" -#include "third_party/nearby/presence/broadcast_request.h" -#include "third_party/nearby/presence/data_element.h" +#include "presence/broadcast_request.h" +#include "presence/data_element.h" namespace nearby { namespace presence { diff --git a/presence/advertisement_factory.cc b/presence/advertisement_factory.cc index dff7f20d..ec0ed8bc 100644 --- a/presence/advertisement_factory.cc +++ b/presence/advertisement_factory.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/advertisement_factory.h" +#include "presence/advertisement_factory.h" #include #include @@ -21,7 +21,7 @@ #include "absl/strings/str_format.h" #include "internal/platform/logging.h" #include "internal/platform/uuid.h" -#include "third_party/nearby/presence/data_element.h" +#include "presence/data_element.h" namespace nearby { namespace presence { diff --git a/presence/advertisement_factory.h b/presence/advertisement_factory.h index e55d3870..d0db4dfc 100644 --- a/presence/advertisement_factory.h +++ b/presence/advertisement_factory.h @@ -20,9 +20,9 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "internal/platform/implementation/ble_v2.h" -#include "third_party/nearby/presence/broadcast_request.h" -#include "third_party/nearby/presence/certificate_manager.h" -#include "third_party/nearby/presence/presence_identity.h" +#include "presence/broadcast_request.h" +#include "presence/certificate_manager.h" +#include "presence/presence_identity.h" namespace nearby { namespace presence { diff --git a/presence/advertisement_factory_test.cc b/presence/advertisement_factory_test.cc index e3bbcf98..75534fd7 100644 --- a/presence/advertisement_factory_test.cc +++ b/presence/advertisement_factory_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/advertisement_factory.h" +#include "presence/advertisement_factory.h" #include #include @@ -22,9 +22,9 @@ #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/escaping.h" -#include "third_party/nearby/presence/action_factory.h" -#include "third_party/nearby/presence/certificate_manager.h" -#include "third_party/nearby/presence/data_element.h" +#include "presence/action_factory.h" +#include "presence/certificate_manager.h" +#include "presence/data_element.h" namespace nearby { namespace presence { diff --git a/presence/broadcast_options_test.cc b/presence/broadcast_options_test.cc index 22b16202..e2e5c381 100644 --- a/presence/broadcast_options_test.cc +++ b/presence/broadcast_options_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/broadcast_options.h" +#include "presence/broadcast_options.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/broadcast_request.cc b/presence/broadcast_request.cc index 01359165..d6949aad 100644 --- a/presence/broadcast_request.cc +++ b/presence/broadcast_request.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/broadcast_request.h" +#include "presence/broadcast_request.h" #include "absl/strings/string_view.h" #include "internal/platform/logging.h" -#include "third_party/nearby/presence/encryption.h" -#include "third_party/nearby/presence/presence_identity.h" +#include "presence/encryption.h" +#include "presence/presence_identity.h" namespace nearby { namespace presence { diff --git a/presence/broadcast_request.h b/presence/broadcast_request.h index 85d0e18f..d6c91907 100644 --- a/presence/broadcast_request.h +++ b/presence/broadcast_request.h @@ -22,7 +22,7 @@ #include "absl/strings/string_view.h" #include "absl/types/variant.h" -#include "third_party/nearby/presence/presence_identity.h" +#include "presence/presence_identity.h" namespace nearby { namespace presence { diff --git a/presence/broadcast_request_test.cc b/presence/broadcast_request_test.cc index 0ee077a1..0799a0fb 100644 --- a/presence/broadcast_request_test.cc +++ b/presence/broadcast_request_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/broadcast_request.h" +#include "presence/broadcast_request.h" #include diff --git a/presence/certificate_manager.h b/presence/certificate_manager.h index a6f9f832..a8bdc28c 100644 --- a/presence/certificate_manager.h +++ b/presence/certificate_manager.h @@ -18,7 +18,7 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include "third_party/nearby/presence/presence_identity.h" +#include "presence/presence_identity.h" namespace nearby { namespace presence { diff --git a/presence/credential_test.cc b/presence/credential_test.cc index 988a1b31..b0715d3a 100644 --- a/presence/credential_test.cc +++ b/presence/credential_test.cc @@ -19,7 +19,7 @@ #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/uuid.h" -#include "third_party/nearby/presence/proto/credential.pb.h" +#include "presence/proto/credential.pb.h" namespace nearby { namespace presence { diff --git a/presence/device_motion.cc b/presence/device_motion.cc index a42afc4b..8b79e3f6 100644 --- a/presence/device_motion.cc +++ b/presence/device_motion.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/device_motion.h" +#include "presence/device_motion.h" namespace nearby { namespace presence { diff --git a/presence/device_motion_test.cc b/presence/device_motion_test.cc index 26af0b2b..1155903a 100644 --- a/presence/device_motion_test.cc +++ b/presence/device_motion_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/device_motion.h" +#include "presence/device_motion.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/discovery_filter.cc b/presence/discovery_filter.cc index acfab3dd..0a50af74 100644 --- a/presence/discovery_filter.cc +++ b/presence/discovery_filter.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/discovery_filter.h" +#include "presence/discovery_filter.h" namespace nearby { namespace presence { diff --git a/presence/discovery_filter.h b/presence/discovery_filter.h index 308068ff..4ad1d9f6 100644 --- a/presence/discovery_filter.h +++ b/presence/discovery_filter.h @@ -17,9 +17,9 @@ #include -#include "third_party/nearby/presence/presence_action.h" -#include "third_party/nearby/presence/presence_identity.h" -#include "third_party/nearby/presence/presence_zone.h" +#include "presence/presence_action.h" +#include "presence/presence_identity.h" +#include "presence/presence_zone.h" namespace nearby { namespace presence { class DiscoveryFilter { diff --git a/presence/discovery_filter_test.cc b/presence/discovery_filter_test.cc index 543191b4..2e77e9f3 100644 --- a/presence/discovery_filter_test.cc +++ b/presence/discovery_filter_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/discovery_filter.h" +#include "presence/discovery_filter.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/discovery_options_test.cc b/presence/discovery_options_test.cc index c10d8404..631ed12f 100644 --- a/presence/discovery_options_test.cc +++ b/presence/discovery_options_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/discovery_options.h" +#include "presence/discovery_options.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/encryption.cc b/presence/encryption.cc index b17e63e1..1a3a1f9e 100644 --- a/presence/encryption.cc +++ b/presence/encryption.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/encryption.h" +#include "presence/encryption.h" #include #include diff --git a/presence/encryption_test.cc b/presence/encryption_test.cc index 03accd40..1897610a 100644 --- a/presence/encryption_test.cc +++ b/presence/encryption_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/encryption.h" +#include "presence/encryption.h" #include diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD index ff2da2aa..f5c64b33 100644 --- a/presence/implementation/BUILD +++ b/presence/implementation/BUILD @@ -30,7 +30,7 @@ cc_library( "service_controller_impl.h", ], visibility = [ - "//third_party/nearby/presence:__subpackages__", + "//presence:__subpackages__", ], deps = [ "//internal/crypto", @@ -39,13 +39,13 @@ cc_library( "//internal/platform:logging", "//internal/platform/implementation:comm", "//internal/platform/implementation:types", - "//third_party/nearby/presence:action_factory", - "//third_party/nearby/presence:advertisement_factory", - "//third_party/nearby/presence:credential", - "//third_party/nearby/presence:encryption", - "//third_party/nearby/presence:types", - "//third_party/nearby/presence/implementation/mediums", - "//third_party/nearby/presence/proto:credential_cc_proto", + "//presence:action_factory", + "//presence:advertisement_factory", + "//presence:credential", + "//presence:encryption", + "//presence:types", + "//presence/implementation/mediums", + "//presence/proto:credential_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", @@ -60,7 +60,7 @@ cc_test( deps = [ ":internal", "//internal/platform/implementation/g3", # build_cleaner: keep - "//third_party/nearby/presence:types", + "//presence:types", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", @@ -77,7 +77,7 @@ cc_test( "//internal/crypto", "//internal/platform/implementation:types", "//internal/platform/implementation/g3", # build_cleaner: keep - "//third_party/nearby/presence:encryption", + "//presence:encryption", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/presence/implementation/advertisement_decoder.cc b/presence/implementation/advertisement_decoder.cc index 3d9221a3..f276d6e2 100644 --- a/presence/implementation/advertisement_decoder.cc +++ b/presence/implementation/advertisement_decoder.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/implementation/advertisement_decoder.h" +#include "presence/implementation/advertisement_decoder.h" #include #include @@ -25,8 +25,8 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "internal/platform/logging.h" -#include "third_party/nearby/presence/action_factory.h" -#include "third_party/nearby/presence/data_element.h" +#include "presence/action_factory.h" +#include "presence/data_element.h" namespace nearby { namespace presence { diff --git a/presence/implementation/advertisement_decoder.h b/presence/implementation/advertisement_decoder.h index f574ed81..d2f8ef0f 100644 --- a/presence/implementation/advertisement_decoder.h +++ b/presence/implementation/advertisement_decoder.h @@ -20,10 +20,10 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "third_party/nearby/presence/advertisement_factory.h" -#include "third_party/nearby/presence/data_element.h" -#include "third_party/nearby/presence/implementation/credential_manager.h" -#include "third_party/nearby/presence/presence_identity.h" +#include "presence/advertisement_factory.h" +#include "presence/data_element.h" +#include "presence/implementation/credential_manager.h" +#include "presence/presence_identity.h" namespace nearby { namespace presence { diff --git a/presence/implementation/advertisement_decoder_test.cc b/presence/implementation/advertisement_decoder_test.cc index 979f7ad7..445c8ea1 100644 --- a/presence/implementation/advertisement_decoder_test.cc +++ b/presence/implementation/advertisement_decoder_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/implementation/advertisement_decoder.h" +#include "presence/implementation/advertisement_decoder.h" #include #include @@ -21,8 +21,8 @@ #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" -#include "third_party/nearby/presence/data_element.h" -#include "third_party/nearby/presence/implementation/credential_manager_impl.h" +#include "presence/data_element.h" +#include "presence/implementation/credential_manager_impl.h" namespace nearby { namespace presence { diff --git a/presence/implementation/broadcast_manager.h b/presence/implementation/broadcast_manager.h index 8567293d..83de0f95 100644 --- a/presence/implementation/broadcast_manager.h +++ b/presence/implementation/broadcast_manager.h @@ -15,8 +15,8 @@ #ifndef THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_BROADCAST_MANAGER_H_ #define THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_BROADCAST_MANAGER_H_ -#include "third_party/nearby/presence/implementation/credential_manager.h" -#include "third_party/nearby/presence/implementation/mediums/mediums.h" +#include "presence/implementation/credential_manager.h" +#include "presence/implementation/mediums/mediums.h" namespace nearby { namespace presence { diff --git a/presence/implementation/credential_manager.h b/presence/implementation/credential_manager.h index c2a468d6..5775a495 100644 --- a/presence/implementation/credential_manager.h +++ b/presence/implementation/credential_manager.h @@ -22,8 +22,8 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "internal/platform/implementation/credential_storage.h" -#include "third_party/nearby/presence/presence_identity.h" -#include "third_party/nearby/presence/proto/credential.pb.h" +#include "presence/presence_identity.h" +#include "presence/proto/credential.pb.h" namespace nearby { namespace presence { diff --git a/presence/implementation/credential_manager_impl.cc b/presence/implementation/credential_manager_impl.cc index 4a0c0d0c..1447b1a3 100644 --- a/presence/implementation/credential_manager_impl.cc +++ b/presence/implementation/credential_manager_impl.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/implementation/credential_manager_impl.h" +#include "presence/implementation/credential_manager_impl.h" #include #include @@ -25,7 +25,7 @@ #include "internal/platform/base64_utils.h" #include "internal/platform/implementation/crypto.h" #include "internal/platform/logging.h" -#include "third_party/nearby/presence/encryption.h" +#include "presence/encryption.h" namespace nearby { namespace presence { diff --git a/presence/implementation/credential_manager_impl.h b/presence/implementation/credential_manager_impl.h index a85624bc..cc75a4b0 100644 --- a/presence/implementation/credential_manager_impl.h +++ b/presence/implementation/credential_manager_impl.h @@ -24,9 +24,9 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "internal/platform/credential_storage.h" -#include "third_party/nearby/presence/implementation/credential_manager.h" -#include "third_party/nearby/presence/presence_identity.h" -#include "third_party/nearby/presence/proto/credential.pb.h" +#include "presence/implementation/credential_manager.h" +#include "presence/presence_identity.h" +#include "presence/proto/credential.pb.h" namespace nearby { namespace presence { diff --git a/presence/implementation/credential_manager_impl_test.cc b/presence/implementation/credential_manager_impl_test.cc index e2a4e6fa..0a4e3a7a 100644 --- a/presence/implementation/credential_manager_impl_test.cc +++ b/presence/implementation/credential_manager_impl_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/implementation/credential_manager_impl.h" +#include "presence/implementation/credential_manager_impl.h" #include @@ -23,7 +23,7 @@ #include "internal/crypto/encryptor.h" #include "internal/crypto/symmetric_key.h" #include "internal/platform/implementation/crypto.h" -#include "third_party/nearby/presence/encryption.h" +#include "presence/encryption.h" namespace nearby { namespace presence { diff --git a/presence/implementation/mediums/BUILD b/presence/implementation/mediums/BUILD index 597db6e4..bcc1aae1 100644 --- a/presence/implementation/mediums/BUILD +++ b/presence/implementation/mediums/BUILD @@ -21,7 +21,7 @@ cc_library( "mediums.h", ], visibility = [ - "//third_party/nearby/presence/implementation:__subpackages__", + "//presence/implementation:__subpackages__", ], deps = [ "//internal/platform:base", diff --git a/presence/implementation/mediums/mediums.h b/presence/implementation/mediums/mediums.h index 92fc2b4f..c3f3d840 100644 --- a/presence/implementation/mediums/mediums.h +++ b/presence/implementation/mediums/mediums.h @@ -15,7 +15,7 @@ #ifndef THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_MEDIUMS_MEDIUMS_H_ #define THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_MEDIUMS_MEDIUMS_H_ -#include "third_party/nearby/presence/implementation/mediums/ble.h" +#include "presence/implementation/mediums/ble.h" namespace nearby { namespace presence { diff --git a/presence/implementation/mock_service_controller.h b/presence/implementation/mock_service_controller.h index 65eeae0e..0882c90a 100644 --- a/presence/implementation/mock_service_controller.h +++ b/presence/implementation/mock_service_controller.h @@ -15,7 +15,7 @@ #ifndef THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_MOCK_SERVICE_CONTROLLER_H_ #define THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_MOCK_SERVICE_CONTROLLER_H_ -#include "third_party/nearby/presence/implementation/service_controller.h" +#include "presence/implementation/service_controller.h" namespace nearby { namespace presence { diff --git a/presence/implementation/scan_manager.h b/presence/implementation/scan_manager.h index 753f75cb..affb91b1 100644 --- a/presence/implementation/scan_manager.h +++ b/presence/implementation/scan_manager.h @@ -15,8 +15,8 @@ #ifndef THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_SCAN_MANAGER_H_ #define THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_SCAN_MANAGER_H_ -#include "third_party/nearby/presence/implementation/credential_manager.h" -#include "third_party/nearby/presence/implementation/mediums/mediums.h" +#include "presence/implementation/credential_manager.h" +#include "presence/implementation/mediums/mediums.h" namespace nearby { namespace presence { diff --git a/presence/implementation/service_controller_impl.h b/presence/implementation/service_controller_impl.h index 3a34f8e4..4d381246 100644 --- a/presence/implementation/service_controller_impl.h +++ b/presence/implementation/service_controller_impl.h @@ -15,9 +15,9 @@ #ifndef THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_SERVICE_CONTROLLER_IMPL_H_ #define THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_SERVICE_CONTROLLER_IMPL_H_ -#include "third_party/nearby/presence/implementation/credential_manager_impl.h" -#include "third_party/nearby/presence/implementation/mediums/mediums.h" -#include "third_party/nearby/presence/implementation/service_controller.h" +#include "presence/implementation/credential_manager_impl.h" +#include "presence/implementation/mediums/mediums.h" +#include "presence/implementation/service_controller.h" /* * This class implements {@code ServiceController} functions. Owns mediums and diff --git a/presence/listeners.h b/presence/listeners.h index edd81958..72da4b01 100644 --- a/presence/listeners.h +++ b/presence/listeners.h @@ -16,7 +16,7 @@ #define THIRD_PARTY_NEARBY_PRESENCE_LISTENERS_H_ #include "internal/platform/listeners.h" -#include "third_party/nearby/presence/status.h" +#include "presence/status.h" namespace nearby { namespace presence { diff --git a/presence/presence_action.cc b/presence/presence_action.cc index 606d6f0f..3fca082c 100644 --- a/presence/presence_action.cc +++ b/presence/presence_action.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_action.h" +#include "presence/presence_action.h" #include "glog/logging.h" diff --git a/presence/presence_action_test.cc b/presence/presence_action_test.cc index ee66268a..64b5e78e 100644 --- a/presence/presence_action_test.cc +++ b/presence/presence_action_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_action.h" +#include "presence/presence_action.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/presence_client.cc b/presence/presence_client.cc index fc04c2dc..7f4ea1e9 100644 --- a/presence/presence_client.cc +++ b/presence/presence_client.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_client.h" +#include "presence/presence_client.h" -#include "third_party/nearby/presence/presence_device.h" +#include "presence/presence_device.h" namespace nearby { namespace presence { diff --git a/presence/presence_client.h b/presence/presence_client.h index 3ad97115..cf33a9a2 100644 --- a/presence/presence_client.h +++ b/presence/presence_client.h @@ -17,11 +17,11 @@ #include -#include "third_party/nearby/presence/broadcast_options.h" -#include "third_party/nearby/presence/discovery_filter.h" -#include "third_party/nearby/presence/discovery_options.h" -#include "third_party/nearby/presence/listeners.h" -#include "third_party/nearby/presence/presence_device.h" +#include "presence/broadcast_options.h" +#include "presence/discovery_filter.h" +#include "presence/discovery_options.h" +#include "presence/listeners.h" +#include "presence/presence_device.h" namespace nearby { namespace presence { diff --git a/presence/presence_client_test.cc b/presence/presence_client_test.cc index d8f81e5d..3db1bc6f 100644 --- a/presence/presence_client_test.cc +++ b/presence/presence_client_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_client.h" +#include "presence/presence_client.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/presence_device.cc b/presence/presence_device.cc index 90cef494..86713bdf 100644 --- a/presence/presence_device.cc +++ b/presence/presence_device.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_device.h" +#include "presence/presence_device.h" namespace nearby { namespace presence { diff --git a/presence/presence_device_test.cc b/presence/presence_device_test.cc index 2025a9cd..820aa681 100644 --- a/presence/presence_device_test.cc +++ b/presence/presence_device_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_device.h" +#include "presence/presence_device.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/presence_identity.cc b/presence/presence_identity.cc index a05e2697..e0d5144b 100644 --- a/presence/presence_identity.cc +++ b/presence/presence_identity.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_identity.h" +#include "presence/presence_identity.h" namespace nearby { namespace presence { diff --git a/presence/presence_identity_test.cc b/presence/presence_identity_test.cc index 332eda4c..91f14416 100644 --- a/presence/presence_identity_test.cc +++ b/presence/presence_identity_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_identity.h" +#include "presence/presence_identity.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" diff --git a/presence/presence_service.h b/presence/presence_service.h index 86142571..573fe5df 100644 --- a/presence/presence_service.h +++ b/presence/presence_service.h @@ -17,7 +17,7 @@ #include -#include "third_party/nearby/presence/implementation/service_controller.h" +#include "presence/implementation/service_controller.h" namespace nearby { namespace presence { diff --git a/presence/presence_service_test.cc b/presence/presence_service_test.cc index f32e4312..e49d9c8b 100644 --- a/presence/presence_service_test.cc +++ b/presence/presence_service_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_service.h" +#include "presence/presence_service.h" #include "gtest/gtest.h" diff --git a/presence/presence_zone.cc b/presence/presence_zone.cc index 26f1262e..2fcdad45 100644 --- a/presence/presence_zone.cc +++ b/presence/presence_zone.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_zone.h" +#include "presence/presence_zone.h" namespace nearby { namespace presence { diff --git a/presence/presence_zone.h b/presence/presence_zone.h index 2f3c7661..dd65e939 100644 --- a/presence/presence_zone.h +++ b/presence/presence_zone.h @@ -17,7 +17,7 @@ #include -#include "third_party/nearby/presence/device_motion.h" +#include "presence/device_motion.h" namespace nearby { namespace presence { class PresenceZone { diff --git a/presence/presence_zone_test.cc b/presence/presence_zone_test.cc index fb77f742..588f0a86 100644 --- a/presence/presence_zone_test.cc +++ b/presence/presence_zone_test.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/presence_zone.h" +#include "presence/presence_zone.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" -#include "third_party/nearby/presence/device_motion.h" +#include "presence/device_motion.h" namespace nearby { namespace presence { diff --git a/presence/scan_request.h b/presence/scan_request.h index 03f547e4..a576b225 100644 --- a/presence/scan_request.h +++ b/presence/scan_request.h @@ -19,10 +19,10 @@ #include #include "net/proto2/util/public/message_differencer.h" -#include "third_party/nearby/presence/data_element.h" -#include "third_party/nearby/presence/power_mode.h" -#include "third_party/nearby/presence/presence_identity.h" -#include "third_party/nearby/presence/proto/credential.pb.h" +#include "presence/data_element.h" +#include "presence/power_mode.h" +#include "presence/presence_identity.h" +#include "presence/proto/credential.pb.h" using MD = proto2::util::MessageDifferencer; diff --git a/presence/scan_request_builder.cc b/presence/scan_request_builder.cc index f5a2692e..a0eb3b75 100644 --- a/presence/scan_request_builder.cc +++ b/presence/scan_request_builder.cc @@ -13,8 +13,8 @@ // limitations under the License. #include -#include "third_party/nearby/presence/scan_request.h" -#include "third_party/nearby/presence/scan_request_builder.h" +#include "presence/scan_request.h" +#include "presence/scan_request_builder.h" namespace nearby { namespace presence { diff --git a/presence/scan_request_builder.h b/presence/scan_request_builder.h index 1ecf5012..e3e18386 100644 --- a/presence/scan_request_builder.h +++ b/presence/scan_request_builder.h @@ -18,10 +18,10 @@ #include #include "absl/strings/string_view.h" -#include "third_party/nearby/presence/power_mode.h" -#include "third_party/nearby/presence/presence_identity.h" -#include "third_party/nearby/presence/presence_zone.h" -#include "third_party/nearby/presence/scan_request.h" +#include "presence/power_mode.h" +#include "presence/presence_identity.h" +#include "presence/presence_zone.h" +#include "presence/scan_request.h" namespace nearby { namespace presence { diff --git a/presence/scan_request_builder_test.cc b/presence/scan_request_builder_test.cc index 689ece2a..9c545ab1 100644 --- a/presence/scan_request_builder_test.cc +++ b/presence/scan_request_builder_test.cc @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/scan_request_builder.h" +#include "presence/scan_request_builder.h" #include #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" -#include "third_party/nearby/presence/power_mode.h" -#include "third_party/nearby/presence/presence_identity.h" -#include "third_party/nearby/presence/scan_request.h" +#include "presence/power_mode.h" +#include "presence/presence_identity.h" +#include "presence/scan_request.h" namespace nearby { namespace presence { diff --git a/presence/status_test.cc b/presence/status_test.cc index 24c114d7..3d61cb2d 100644 --- a/presence/status_test.cc +++ b/presence/status_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/presence/status.h" +#include "presence/status.h" #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h"