diff --git a/connections/BUILD b/connections/BUILD index 7f3ce950b4..9cef6446ac 100644 --- a/connections/BUILD +++ b/connections/BUILD @@ -33,21 +33,21 @@ cc_library( visibility = [ ":partners", "//chrome/chromeos/assistant/data_migration/lib:__pkg__", - "//connections:__subpackages__", "//location/nearby/testing:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":core_types", - "//connections/implementation:internal", - "//connections/v3:v3_types", - "//internal/analytics:event_logger", - "//internal/interop:device", - "//internal/platform:base", - "//internal/platform:types", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/connections/implementation:internal", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/analytics:event_logger", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", ], ) @@ -80,19 +80,19 @@ cc_library( visibility = [ ":partners", "//chrome/chromeos/assistant/data_migration/lib:__pkg__", - "//connections:__subpackages__", "//location/nearby/testing:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//internal/interop:authentication_status", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform:util", - "//proto:connections_enums_cc_proto", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/random", - "@com_google_absl//absl/types:variant", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/random", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:util", + "//third_party/nearby/proto:connections_enums_cc_proto", ], ) @@ -110,14 +110,14 @@ cc_test( deps = [ ":core", ":core_types", - "//connections/implementation:internal_test", - "//connections/v3:v3_types", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/connections/implementation:internal_test", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/connections/c/BUILD b/connections/c/BUILD index debea49d78..3abb0bb623 100644 --- a/connections/c/BUILD +++ b/connections/c/BUILD @@ -15,8 +15,8 @@ load("//third_party/cpptoolchains/windows_llvm/build_defs:windows.bzl", "windows") package(default_visibility = [ - "//connections:__subpackages__", "//location/nearby:__subpackages__", + "//third_party/nearby/connections:__subpackages__", ]) licenses(["notice"]) @@ -38,18 +38,18 @@ cc_library( copts = ["-DNC_DLL"], deps = [ ":nc_types", - "//connections:core", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:types", - "//proto:connections_enums_cc_proto", - "@com_google_absl//absl/base:no_destructor", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:no_destructor", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/types:span", + "//third_party/nearby/connections:core", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/proto:connections_enums_cc_proto", ], ) @@ -60,7 +60,7 @@ windows.cc_windows_dll( tags = ["windows-dll"], deps = [ ":nc", - "//internal/platform/implementation/windows", - "@com_google_absl//absl/strings", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform/implementation/windows", ], ) diff --git a/connections/core_test.cc b/connections/core_test.cc index f995ab928c..60db3776ea 100644 --- a/connections/core_test.cc +++ b/connections/core_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "connections/advertising_options.h" diff --git a/connections/dart/BUILD b/connections/dart/BUILD index 79e2376000..d5bfcc5472 100644 --- a/connections/dart/BUILD +++ b/connections/dart/BUILD @@ -34,17 +34,17 @@ windows.cc_windows_dll( copts = ["-DNC_DART_DLL"], tags = ["windows-dll"], deps = [ - "//connections/c:nc_types", - "//connections/c:nc_windows", - "//internal/platform:types", - "//internal/platform/implementation/windows", + "//third_party/absl/base:core_headers", + "//third_party/absl/base:no_destructor", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings", + "//third_party/absl/strings:string_view", + "//third_party/absl/synchronization", "//third_party/dart_lang/v2:dart_api_dl", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:no_destructor", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/synchronization", + "//third_party/nearby/connections/c:nc_types", + "//third_party/nearby/connections/c:nc_windows", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/windows", ], ) @@ -61,20 +61,20 @@ objc_library( "nearby_connections_client_state.h", ], deps = [ - "//connections/c:nc", - "//connections/c:nc_types", - "//connections/implementation/flags:connections_flags", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/apple", # buildcleaner: keep + "//third_party/absl/base:core_headers", + "//third_party/absl/base:no_destructor", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings", + "//third_party/absl/strings:string_view", + "//third_party/absl/synchronization", "//third_party/dart_lang/v2:dart_api_dl", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:no_destructor", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/synchronization", + "//third_party/nearby/connections/c:nc", + "//third_party/nearby/connections/c:nc_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/apple", # buildcleaner: keep ], alwayslink = 1, ) diff --git a/connections/implementation/BUILD b/connections/implementation/BUILD index e985af1a8e..ee107bdc46 100644 --- a/connections/implementation/BUILD +++ b/connections/implementation/BUILD @@ -107,52 +107,52 @@ cc_library( ], visibility = [ "//chrome/chromeos/assistant/data_migration/lib:__pkg__", - "//connections:__pkg__", - "//connections:partners", - "//connections/implementation/fuzzers:__pkg__", - "//connections/implementation/mediums/multiplex:__pkg__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__pkg__", + "//third_party/nearby/connections:partners", + "//third_party/nearby/connections/implementation/fuzzers:__pkg__", + "//third_party/nearby/connections/implementation/mediums/multiplex:__pkg__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//connections:core_types", - "//connections/implementation/analytics", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums", - "//connections/implementation/mediums:utils", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//connections/v3:v3_types", - "//internal/analytics:event_logger", - "//internal/flags:nearby_flags", - "//internal/interop:authentication_status", - "//internal/interop:authentication_transport_interface", - "//internal/interop:device", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:comm", - "//internal/platform:connection_info", - "//internal/platform:error_code_recorder", - "//internal/platform:types", - "//internal/platform:util", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "//internal/platform/implementation:wifi_utils", - "//internal/proto/analytics:connections_log_cc_proto", - "//proto:connections_enums_cc_proto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:btree", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/log:check", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/analytics", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums", + "//third_party/nearby/connections/implementation/mediums:utils", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/analytics:event_logger", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/internal/interop:authentication_transport_interface", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:connection_info", + "//third_party/nearby/internal/platform:error_code_recorder", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:util", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation:wifi_utils", + "//third_party/nearby/internal/proto/analytics:connections_log_cc_proto", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_google_ukey2//:ukey2", ], ) @@ -163,7 +163,7 @@ cc_library( "message_lite.h", ], visibility = [ - "//connections:__subpackages__", + "//third_party/nearby/connections:__subpackages__", ], deps = [ "@com_google_protobuf//:protobuf_lite", @@ -187,20 +187,20 @@ cc_library( "simulation_user.h", ], visibility = [ - "//connections:__subpackages__", + "//third_party/nearby/connections:__subpackages__", ], deps = [ ":internal", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//connections/v3:v3_types", - "//internal/flags:nearby_flags", - "//internal/interop:device", - "//internal/platform:base", - "//internal/platform:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/strings", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/strings", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", "@com_google_googletest//:gtest_for_library_testonly", ], ) @@ -217,19 +217,19 @@ cc_test( deps = [ ":internal", ":internal_test", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/proto/analytics:connections_log_cc_proto", - "//proto:connections_enums_cc_proto", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/proto/analytics:connections_log_cc_proto", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -240,14 +240,14 @@ cc_test( deps = [ ":internal", ":internal_test", - "//connections:core_types", - "//connections/v3:v3_types", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -264,25 +264,25 @@ cc_test( deps = [ ":internal", ":internal_test", - "//connections:core_types", - "//connections/implementation/analytics", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//connections/v3:v3_types", - "//internal/flags:nearby_flags", - "//internal/interop:authentication_status", - "//internal/interop:authentication_transport_interface", - "//internal/interop:device", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//proto:connections_enums_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/analytics", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/internal/interop:authentication_transport_interface", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -296,10 +296,10 @@ cc_test( ], deps = [ ":internal", - "//internal/platform:base", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ], ) @@ -309,13 +309,13 @@ cc_test( srcs = ["offline_frames_validator_test.cc"], deps = [ ":internal", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -328,23 +328,23 @@ cc_test( deps = [ ":internal", "//base:casts", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//connections/v3:v3_types", - "//internal/analytics:mock_event_logger", - "//internal/flags:nearby_flags", - "//internal/interop:device", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//proto:connections_enums_cc_proto", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) @@ -356,13 +356,13 @@ cc_test( ], deps = [ ":internal", - "//connections/implementation/analytics", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//proto:connections_enums_cc_proto", + "//third_party/absl/time", + "//third_party/nearby/connections/implementation/analytics", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", "@com_google_ukey2//:ukey2", ], @@ -375,18 +375,18 @@ cc_test( ], deps = [ ":internal", - "//connections:core_types", - "//connections/implementation/analytics", - "//connections/implementation/flags:connections_flags", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", - "//proto:connections_enums_cc_proto", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/analytics", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -399,15 +399,15 @@ cc_test( ], deps = [ ":internal", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/proto/analytics:connections_log_cc_proto", - "//proto:connections_enums_cc_proto", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/proto/analytics:connections_log_cc_proto", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", "@com_google_ukey2//:ukey2", ], @@ -420,12 +420,12 @@ cc_test( ], deps = [ ":internal", - "//connections/implementation/analytics", - "//internal/platform:base", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//proto:connections_enums_cc_proto", + "//third_party/absl/time", + "//third_party/nearby/connections/implementation/analytics", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -438,17 +438,17 @@ cc_test( deps = [ ":internal", ":internal_test", - "//connections:core_types", - "//connections/implementation/analytics", - "//connections/implementation/flags:connections_flags", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/analytics", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -461,15 +461,15 @@ cc_test( deps = [ ":internal", ":internal_test", - "//connections:core_types", - "//connections/implementation/mediums", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/mediums", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -483,20 +483,20 @@ cc_test( deps = [ ":internal", ":internal_test", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//connections/v3:v3_types", - "//internal/flags:nearby_flags", - "//internal/interop:authentication_status", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//proto:connections_enums_cc_proto", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/v3:v3_types", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) @@ -508,9 +508,9 @@ cc_test( ], deps = [ ":internal", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -523,11 +523,11 @@ cc_test( ], deps = [ ":internal", - "//connections:core_types", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/connections/implementation/analytics/BUILD b/connections/implementation/analytics/BUILD index c2dd6e1546..ec71ffd524 100644 --- a/connections/implementation/analytics/BUILD +++ b/connections/implementation/analytics/BUILD @@ -28,23 +28,23 @@ cc_library( "throughput_recorder.h", ], copts = ["-DCORE_ADAPTER_DLL"], - visibility = ["//connections:__subpackages__"], + visibility = ["//third_party/nearby/connections:__subpackages__"], deps = [ - "//connections:core_types", - "//internal/analytics:event_logger", - "//internal/platform:error_code_recorder", - "//internal/platform:types", - "//internal/platform/implementation:types", - "//internal/proto/analytics:connections_log_cc_proto", - "//proto:connections_enums_cc_proto", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/meta:type_traits", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", + "//third_party/absl/algorithm:container", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:btree", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/meta:type_traits", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/internal/analytics:event_logger", + "//third_party/nearby/internal/platform:error_code_recorder", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto/analytics:connections_log_cc_proto", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_google_protobuf//:protobuf_lite", ], ) @@ -59,17 +59,17 @@ cc_test( shard_count = 16, deps = [ ":analytics", - "//connections:core_types", - "//internal/analytics:mock_event_logger", - "//internal/platform:base", - "//internal/platform:error_code_recorder", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/proto/analytics:connections_log_cc_proto", "//net/proto2/contrib/parse_proto:parse_text_proto", - "//proto:connections_enums_cc_proto", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:error_code_recorder", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/proto/analytics:connections_log_cc_proto", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/connections/implementation/analytics/analytics_recorder_test.cc b/connections/implementation/analytics/analytics_recorder_test.cc index 04e5cbcbce..e935c70d91 100644 --- a/connections/implementation/analytics/analytics_recorder_test.cc +++ b/connections/implementation/analytics/analytics_recorder_test.cc @@ -23,7 +23,6 @@ #include "net/proto2/contrib/parse_proto/parse_text_proto.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "connections/implementation/analytics/connection_attempt_metadata_params.h" diff --git a/connections/implementation/base_endpoint_channel_test.cc b/connections/implementation/base_endpoint_channel_test.cc index c59ac361ab..d28429905f 100644 --- a/connections/implementation/base_endpoint_channel_test.cc +++ b/connections/implementation/base_endpoint_channel_test.cc @@ -22,7 +22,6 @@ #include "securegcm/ukey2_handshake.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" diff --git a/connections/implementation/base_pcp_handler_test.cc b/connections/implementation/base_pcp_handler_test.cc index 12aa3ff199..22cb2e85a7 100644 --- a/connections/implementation/base_pcp_handler_test.cc +++ b/connections/implementation/base_pcp_handler_test.cc @@ -22,7 +22,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" diff --git a/connections/implementation/ble_advertisement_test.cc b/connections/implementation/ble_advertisement_test.cc index db6a021c4c..92f34791e9 100644 --- a/connections/implementation/ble_advertisement_test.cc +++ b/connections/implementation/ble_advertisement_test.cc @@ -15,7 +15,6 @@ #include "connections/implementation/ble_advertisement.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "connections/implementation/base_pcp_handler.h" diff --git a/connections/implementation/client_proxy_test.cc b/connections/implementation/client_proxy_test.cc index 150b8c476a..870ea6526a 100644 --- a/connections/implementation/client_proxy_test.cc +++ b/connections/implementation/client_proxy_test.cc @@ -23,7 +23,6 @@ #include "base/casts.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" diff --git a/connections/implementation/connections_authentication_transport_test.cc b/connections/implementation/connections_authentication_transport_test.cc index c471a80158..8c5baa08f1 100644 --- a/connections/implementation/connections_authentication_transport_test.cc +++ b/connections/implementation/connections_authentication_transport_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "connections/implementation/analytics/analytics_recorder.h" diff --git a/connections/implementation/endpoint_channel_manager_test.cc b/connections/implementation/endpoint_channel_manager_test.cc index 7a1718d02f..a4a2b1b4b3 100644 --- a/connections/implementation/endpoint_channel_manager_test.cc +++ b/connections/implementation/endpoint_channel_manager_test.cc @@ -22,7 +22,6 @@ #include "securegcm/ukey2_handshake.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" diff --git a/connections/implementation/endpoint_manager_test.cc b/connections/implementation/endpoint_manager_test.cc index 8c10c07f32..77b0d035e8 100644 --- a/connections/implementation/endpoint_manager_test.cc +++ b/connections/implementation/endpoint_manager_test.cc @@ -22,7 +22,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" diff --git a/connections/implementation/flags/BUILD b/connections/implementation/flags/BUILD index 9f42e7124f..33d1a4a41b 100644 --- a/connections/implementation/flags/BUILD +++ b/connections/implementation/flags/BUILD @@ -19,16 +19,16 @@ cc_library( "nearby_connections_feature_flags.h", ], visibility = [ - "//connections:__subpackages__", "//googlemac/iPhone/Shared/Identity/SmartSetup:__subpackages__", - "//internal/platform/implementation:__subpackages__", "//location/nearby/cpp:__subpackages__", "//location/nearby/sharing:__subpackages__", "//location/nearby/testing:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//internal/flags:flag_reader", - "@com_google_absl//absl/strings", + "//third_party/absl/strings", + "//third_party/nearby/internal/flags:flag_reader", ], ) diff --git a/connections/implementation/fuzzers/BUILD b/connections/implementation/fuzzers/BUILD index 0cfc0c5ab8..b626a42779 100644 --- a/connections/implementation/fuzzers/BUILD +++ b/connections/implementation/fuzzers/BUILD @@ -22,10 +22,10 @@ cc_test( ], tags = ["componentid:148515"], deps = [ - "//connections/implementation:internal", - "//internal/platform:base", - "//internal/platform/implementation/g3", "//testing/fuzzing:fuzztest", + "//third_party/nearby/connections/implementation:internal", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation/g3", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/connections/implementation/mediums/BUILD b/connections/implementation/mediums/BUILD index 38a8245ac3..76c84031dd 100644 --- a/connections/implementation/mediums/BUILD +++ b/connections/implementation/mediums/BUILD @@ -42,37 +42,37 @@ cc_library( ], copts = ["-DNO_WEBRTC"], visibility = [ - "//connections/implementation:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", ], deps = [ ":utils", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums/ble_v2", - "//connections/implementation/mediums/multiplex", - "//connections/implementation/mediums/webrtc", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:wifi_utils", - "//proto/mediums:web_rtc_signaling_frames_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:btree", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums/ble_v2", + "//third_party/nearby/connections/implementation/mediums/multiplex", + "//third_party/nearby/connections/implementation/mediums/webrtc", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:wifi_utils", + "//third_party/nearby/proto/mediums:web_rtc_signaling_frames_cc_proto", # TODO: Support WebRTC - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", ], ) @@ -93,19 +93,19 @@ cc_library( ], copts = ["-DNO_WEBRTC"], visibility = [ - "//connections/implementation:__pkg__", - "//connections/implementation/mediums/ble_v2:__subpackages__", - "//connections/implementation/mediums/multiplex:__pkg__", - "//connections/implementation/mediums/webrtc:__pkg__", + "//third_party/nearby/connections/implementation:__pkg__", + "//third_party/nearby/connections/implementation/mediums/ble_v2:__subpackages__", + "//third_party/nearby/connections/implementation/mediums/multiplex:__pkg__", + "//third_party/nearby/connections/implementation/mediums/webrtc:__pkg__", ], deps = [ - "//connections/implementation/mediums/webrtc:data_types", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/platform:base", - "//internal/platform:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/strings", + "//third_party/nearby/connections/implementation/mediums/webrtc:data_types", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", ], ) @@ -127,22 +127,22 @@ cc_test( deps = [ ":mediums", ":utils", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums/ble_v2", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/base:core_headers", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums/ble_v2", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -162,13 +162,13 @@ cc_test( deps = [ ":mediums", ":utils", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/connections/implementation/mediums/ble_v2/BUILD b/connections/implementation/mediums/ble_v2/BUILD index 288a65d3c3..d6eb1749ba 100644 --- a/connections/implementation/mediums/ble_v2/BUILD +++ b/connections/implementation/mediums/ble_v2/BUILD @@ -41,32 +41,32 @@ cc_library( ], copts = ["-DCORE_ADAPTER_DLL"], visibility = [ - "//connections/implementation:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", ], deps = [ - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums:utils", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform:util", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//proto/mediums:ble_frames_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/numeric:int128", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums:utils", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:util", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/proto/mediums:ble_frames_cc_proto", "@aappleby_smhasher//:libmurmur3", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/numeric:int128", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", ], ) @@ -85,25 +85,25 @@ cc_test( ], deps = [ ":ble_v2", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums:utils", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation/g3", # buildcleaner: keep - "//proto/mediums:ble_frames_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/hash:hash_testing", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums:utils", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation/g3", # buildcleaner: keep + "//third_party/nearby/proto/mediums:ble_frames_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/hash:hash_testing", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) diff --git a/connections/implementation/mediums/ble_v2/ble_advertisement_test.cc b/connections/implementation/mediums/ble_v2/ble_advertisement_test.cc index 4ef352d619..83f5646909 100644 --- a/connections/implementation/mediums/ble_v2/ble_advertisement_test.cc +++ b/connections/implementation/mediums/ble_v2/ble_advertisement_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/hash/hash_testing.h" #include "absl/status/status.h" diff --git a/connections/implementation/mediums/ble_v2/ble_packet_test.cc b/connections/implementation/mediums/ble_v2/ble_packet_test.cc index 9a08d53c7e..eaafe7e881 100644 --- a/connections/implementation/mediums/ble_v2/ble_packet_test.cc +++ b/connections/implementation/mediums/ble_v2/ble_packet_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/statusor.h" #include "proto/mediums/ble_frames.proto.h" diff --git a/connections/implementation/mediums/ble_v2/ble_utils_test.cc b/connections/implementation/mediums/ble_v2/ble_utils_test.cc index 6e726a4d38..810e061698 100644 --- a/connections/implementation/mediums/ble_v2/ble_utils_test.cc +++ b/connections/implementation/mediums/ble_v2/ble_utils_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/connections/implementation/mediums/ble_v2/discovered_peripheral_tracker_test.cc b/connections/implementation/mediums/ble_v2/discovered_peripheral_tracker_test.cc index 0683ba59bc..496cea4d3e 100644 --- a/connections/implementation/mediums/ble_v2/discovered_peripheral_tracker_test.cc +++ b/connections/implementation/mediums/ble_v2/discovered_peripheral_tracker_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" diff --git a/connections/implementation/mediums/ble_v2/instant_on_lost_advertisement_test.cc b/connections/implementation/mediums/ble_v2/instant_on_lost_advertisement_test.cc index a3b721f3b3..fc67559afe 100644 --- a/connections/implementation/mediums/ble_v2/instant_on_lost_advertisement_test.cc +++ b/connections/implementation/mediums/ble_v2/instant_on_lost_advertisement_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/connections/implementation/mediums/bluetooth_radio_test.cc b/connections/implementation/mediums/bluetooth_radio_test.cc index cf5241c8c2..517350beca 100644 --- a/connections/implementation/mediums/bluetooth_radio_test.cc +++ b/connections/implementation/mediums/bluetooth_radio_test.cc @@ -15,7 +15,6 @@ #include "connections/implementation/mediums/bluetooth_radio.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/connections/implementation/mediums/multiplex/BUILD b/connections/implementation/mediums/multiplex/BUILD index b655f3cb50..048b0f31d0 100644 --- a/connections/implementation/mediums/multiplex/BUILD +++ b/connections/implementation/mediums/multiplex/BUILD @@ -26,33 +26,33 @@ cc_library( "multiplex_socket.h", ], visibility = [ - "//connections/implementation:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", ], deps = [ - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//connections/implementation/mediums:utils", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform:util", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//proto:connections_enums_cc_proto", - "//proto/mediums:multiplex_frames_cc_proto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/numeric:int128", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/numeric:int128", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/connections/implementation/mediums:utils", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:util", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/proto:connections_enums_cc_proto", + "//third_party/nearby/proto/mediums:multiplex_frames_cc_proto", ], ) @@ -65,22 +65,22 @@ cc_test( ], deps = [ ":multiplex", - "//connections/implementation:internal", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "//internal/platform/implementation/g3", # buildcleaner: keep - "//proto:connections_enums_cc_proto", - "//proto/mediums:multiplex_frames_cc_proto", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/hash:hash_testing", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/connections/implementation:internal", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation/g3", # buildcleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", + "//third_party/nearby/proto/mediums:multiplex_frames_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/hash:hash_testing", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/connections/implementation/mediums/multiplex/multiplex_socket_test.cc b/connections/implementation/mediums/multiplex/multiplex_socket_test.cc index b156d2750c..1be7f569ff 100644 --- a/connections/implementation/mediums/multiplex/multiplex_socket_test.cc +++ b/connections/implementation/mediums/multiplex/multiplex_socket_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" diff --git a/connections/implementation/mediums/webrtc/BUILD b/connections/implementation/mediums/webrtc/BUILD index d821a22128..41bed65f92 100644 --- a/connections/implementation/mediums/webrtc/BUILD +++ b/connections/implementation/mediums/webrtc/BUILD @@ -31,21 +31,21 @@ cc_library( "-DNO_WEBRTC", ], visibility = [ - "//connections/implementation:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", ], deps = [ ":data_types", - "//connections:core_types", - "//connections/implementation/mediums:utils", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:types", - "//proto/mediums:web_rtc_signaling_frames_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/memory", + "//third_party/absl/time", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/mediums:utils", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/proto/mediums:web_rtc_signaling_frames_cc_proto", # TODO: Support WebRTC - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/time", ], ) @@ -62,12 +62,12 @@ cc_library( "-DNO_WEBRTC", ], visibility = [ - "//connections/implementation:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", ], deps = [ - "//connections:core_types", - "//internal/platform:base", - "//internal/platform:types", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", ], ) @@ -86,17 +86,17 @@ cc_test( deps = [ ":data_types", ":webrtc", - "//connections/implementation/mediums:utils", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # buildcleaner: keep + "//third_party/absl/time", + "//third_party/nearby/connections/implementation/mediums:utils", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # buildcleaner: keep "//third_party/protobuf", "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api", "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/connections/implementation/mediums/webrtc/signaling_frames_test.cc b/connections/implementation/mediums/webrtc/signaling_frames_test.cc index 7e11b09ae7..d7712c1d52 100644 --- a/connections/implementation/mediums/webrtc/signaling_frames_test.cc +++ b/connections/implementation/mediums/webrtc/signaling_frames_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/mediums/webrtc_peer_id.h" #include "google/protobuf/text_format.h" diff --git a/connections/implementation/mediums/webrtc/webrtc_socket_impl_test.cc b/connections/implementation/mediums/webrtc/webrtc_socket_impl_test.cc index af3b6d8470..d7bd1a95ef 100644 --- a/connections/implementation/mediums/webrtc/webrtc_socket_impl_test.cc +++ b/connections/implementation/mediums/webrtc/webrtc_socket_impl_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/byte_array.h" #include "webrtc/api/data_channel_interface.h" diff --git a/connections/implementation/mediums/webrtc_peer_id_test.cc b/connections/implementation/mediums/webrtc_peer_id_test.cc index a0fef2177a..eef11389eb 100644 --- a/connections/implementation/mediums/webrtc_peer_id_test.cc +++ b/connections/implementation/mediums/webrtc_peer_id_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/byte_array.h" #include "internal/platform/crypto.h" diff --git a/connections/implementation/mediums/webrtc_test.cc b/connections/implementation/mediums/webrtc_test.cc index 719dbb2b3d..f8aa3f3cdb 100644 --- a/connections/implementation/mediums/webrtc_test.cc +++ b/connections/implementation/mediums/webrtc_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/mediums/webrtc_peer_id.h" #include "connections/implementation/mediums/webrtc_socket.h" diff --git a/connections/implementation/mediums/wifi_test.cc b/connections/implementation/mediums/wifi_test.cc index 8f47f79202..fcae4cfa29 100644 --- a/connections/implementation/mediums/wifi_test.cc +++ b/connections/implementation/mediums/wifi_test.cc @@ -15,7 +15,6 @@ #include "connections/implementation/mediums/wifi.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/connections/implementation/offline_frames_test.cc b/connections/implementation/offline_frames_test.cc index 9e89d60f2a..10399a14ee 100644 --- a/connections/implementation/offline_frames_test.cc +++ b/connections/implementation/offline_frames_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "connections/implementation/flags/nearby_connections_feature_flags.h" diff --git a/connections/implementation/offline_service_controller_test.cc b/connections/implementation/offline_service_controller_test.cc index 1da10e4233..d2f4399f6b 100644 --- a/connections/implementation/offline_service_controller_test.cc +++ b/connections/implementation/offline_service_controller_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" diff --git a/connections/implementation/p2p_point_to_point_pcp_handler_test.cc b/connections/implementation/p2p_point_to_point_pcp_handler_test.cc index ed9d1c7e39..2ae06babb7 100644 --- a/connections/implementation/p2p_point_to_point_pcp_handler_test.cc +++ b/connections/implementation/p2p_point_to_point_pcp_handler_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "connections/implementation/bwu_manager.h" diff --git a/connections/implementation/pcp_manager_test.cc b/connections/implementation/pcp_manager_test.cc index 518e7bdb4e..505a6ea67f 100644 --- a/connections/implementation/pcp_manager_test.cc +++ b/connections/implementation/pcp_manager_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "connections/implementation/endpoint_channel_manager.h" diff --git a/connections/implementation/service_controller_router_test.cc b/connections/implementation/service_controller_router_test.cc index ca953b8301..a581fb7dd1 100644 --- a/connections/implementation/service_controller_router_test.cc +++ b/connections/implementation/service_controller_router_test.cc @@ -22,7 +22,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/types/span.h" #include "connections/implementation/client_proxy.h" diff --git a/connections/listeners_test.cc b/connections/listeners_test.cc index 0f5cd34af8..4e51b1546d 100644 --- a/connections/listeners_test.cc +++ b/connections/listeners_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/byte_array.h" diff --git a/connections/payload_test.cc b/connections/payload_test.cc index 7a3aad025d..ca0876f948 100644 --- a/connections/payload_test.cc +++ b/connections/payload_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/byte_array.h" #include "internal/platform/file.h" diff --git a/connections/status_test.cc b/connections/status_test.cc index daf8bb0c3c..10e27c55a9 100644 --- a/connections/status_test.cc +++ b/connections/status_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/connections/swift/NearbyConnections/BUILD b/connections/swift/NearbyConnections/BUILD index f4b9d58272..31f9eba887 100644 --- a/connections/swift/NearbyConnections/BUILD +++ b/connections/swift/NearbyConnections/BUILD @@ -25,8 +25,8 @@ swift_library( srcs = glob(["Sources/**/*.swift"]), module_name = "NearbyConnections", deps = [ - "//connections/swift/NearbyCoreAdapter", "//third_party/apple_frameworks:Foundation", + "//third_party/nearby/connections/swift/NearbyCoreAdapter", ], ) diff --git a/connections/swift/NearbyCoreAdapter/BUILD b/connections/swift/NearbyCoreAdapter/BUILD index 7b588d832f..9adc94fd69 100644 --- a/connections/swift/NearbyCoreAdapter/BUILD +++ b/connections/swift/NearbyCoreAdapter/BUILD @@ -31,13 +31,13 @@ objc_library( features = ["-layering_check"], module_name = "NearbyCoreAdapter", deps = [ - "//connections:core", - "//connections:core_types", - "//connections/implementation/flags:connections_flags", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform/implementation/apple", # buildcleaner: keep "//third_party/apple_frameworks:Foundation", + "//third_party/nearby/connections:core", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation/apple", # buildcleaner: keep "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ], ) diff --git a/connections/v3/BUILD b/connections/v3/BUILD index ba01d4b09a..7dda8e78a9 100644 --- a/connections/v3/BUILD +++ b/connections/v3/BUILD @@ -30,19 +30,19 @@ cc_library( "params.h", ], visibility = [ - "//connections:__subpackages__", + "//third_party/nearby/connections:__subpackages__", ], deps = [ - "//connections:core_types", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/interop:authentication_status", - "//internal/interop:device", - "//internal/platform:connection_info", - "//internal/platform:types", - "//proto:connections_enums_cc_proto", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:variant", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/absl/types:variant", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:connection_info", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/proto:connections_enums_cc_proto", ], ) @@ -54,9 +54,9 @@ cc_test( ], deps = [ ":v3_types", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/platform:connection_info", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/platform:connection_info", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/connections/v3/connections_device_provider_test.cc b/connections/v3/connections_device_provider_test.cc index 510a28811b..00e57d9628 100644 --- a/connections/v3/connections_device_provider_test.cc +++ b/connections/v3/connections_device_provider_test.cc @@ -15,7 +15,6 @@ #include "connections/v3/connections_device_provider.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/connections/v3/connections_device_test.cc b/connections/v3/connections_device_test.cc index 3a0b9b3ba4..e7b3b49a2f 100644 --- a/connections/v3/connections_device_test.cc +++ b/connections/v3/connections_device_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/proto/offline_wire_formats.pb.h" #include "internal/platform/ble_connection_info.h" diff --git a/fastpair/BUILD b/fastpair/BUILD index cc864b84db..411ded0bd1 100644 --- a/fastpair/BUILD +++ b/fastpair/BUILD @@ -14,7 +14,7 @@ package_group( name = "nearby_fastpair", packages = [ - "//fastpair/...", + "//third_party/nearby/fastpair/...", ], ) @@ -24,16 +24,16 @@ cc_library( hdrs = ["fast_pair_controller.h"], visibility = ["//:__subpackages__"], deps = [ - "//fastpair/common", - "//fastpair/handshake", - "//fastpair/message_stream", - "//fastpair/repository", - "//internal/base", - "//internal/platform:comm", - "//internal/platform:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/handshake", + "//third_party/nearby/fastpair/message_stream", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", ], ) @@ -45,12 +45,12 @@ cc_test( ], deps = [ ":fast_pair_controller", - "//fastpair/message_stream:fake_provider", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/fastpair/message_stream:fake_provider", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -60,9 +60,9 @@ cc_library( hdrs = ["fast_pair_seeker.h"], visibility = ["//:__subpackages__"], deps = [ - "//fastpair/common", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/nearby/fastpair/common", ], ) @@ -92,28 +92,28 @@ cc_library( deps = [ ":fast_pair_plugin", ":fast_pair_seeker", - "//fastpair/common", - "//fastpair/internal", - "//fastpair/repository", - "//fastpair/repository:device_repository", - "//fastpair/repository:repository_impl", - "//fastpair/server_access", - "//internal/account", - "//internal/auth:oauth_lib", - "//internal/auth:types", - "//internal/flags:nearby_flags", - "//internal/network:nearby_http_client", - "//internal/network:types", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/flags:platform_flags", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", - "//internal/preferences", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/fastpair/repository:repository_impl", + "//third_party/nearby/fastpair/server_access", + "//third_party/nearby/internal/account", + "//third_party/nearby/internal/auth:oauth_lib", + "//third_party/nearby/internal/auth:types", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/network:nearby_http_client", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/flags:platform_flags", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/preferences", ], ) @@ -126,16 +126,16 @@ cc_test( deps = [ ":fast_pair_events", ":fast_pair_service", - "//fastpair/internal", - "//fastpair/message_stream:fake_provider", - "//fastpair/plugins:fake_fast_pair_plugin", - "//internal/account", - "//internal/network:types", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", - "//internal/test/google3_only:test", + "//third_party/nearby/fastpair/internal", + "//third_party/nearby/fastpair/message_stream:fake_provider", + "//third_party/nearby/fastpair/plugins:fake_fast_pair_plugin", + "//third_party/nearby/internal/account", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/internal/test/google3_only:test", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -148,11 +148,11 @@ cc_library( "mock_fast_pair_seeker.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":fast_pair_seeker", - "@com_google_absl//absl/status", + "//third_party/absl/status", "@com_google_googletest//:gtest_for_library_testonly", ], ) diff --git a/fastpair/analytics/BUILD b/fastpair/analytics/BUILD index e076f3edff..e331efc864 100644 --- a/fastpair/analytics/BUILD +++ b/fastpair/analytics/BUILD @@ -24,11 +24,11 @@ cc_library( copts = [ "-Ithird_party", ], - visibility = ["//fastpair:__subpackages__"], + visibility = ["//third_party/nearby/fastpair:__subpackages__"], deps = [ - "//internal/analytics:event_logger", - "//internal/proto/analytics:fast_pair_log_cc_proto", - "//proto:fast_pair_enums_cc_proto", + "//third_party/nearby/internal/analytics:event_logger", + "//third_party/nearby/internal/proto/analytics:fast_pair_log_cc_proto", + "//third_party/nearby/proto:fast_pair_enums_cc_proto", ], ) @@ -37,9 +37,9 @@ cc_test( srcs = ["analytics_recorder_test.cc"], deps = [ ":analytics", - "//internal/analytics:mock_event_logger", - "//internal/proto/analytics:fast_pair_log_cc_proto", - "//proto:fast_pair_enums_cc_proto", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/proto/analytics:fast_pair_log_cc_proto", + "//third_party/nearby/proto:fast_pair_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/fastpair/analytics/analytics_recorder_test.cc b/fastpair/analytics/analytics_recorder_test.cc index ea0dfcb8ba..029cd9ab44 100644 --- a/fastpair/analytics/analytics_recorder_test.cc +++ b/fastpair/analytics/analytics_recorder_test.cc @@ -15,7 +15,6 @@ #include "fastpair/analytics/analytics_recorder.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/analytics/mock_event_logger.h" #include "internal/proto/analytics/fast_pair_log.proto.h" diff --git a/fastpair/common/BUILD b/fastpair/common/BUILD index ab62e395fa..6b4aeb23af 100644 --- a/fastpair/common/BUILD +++ b/fastpair/common/BUILD @@ -42,17 +42,17 @@ cc_library( "protocol.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/proto:fastpair_cc_proto", - "//internal/crypto_cros", - "//internal/platform:types", - "//internal/preferences", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/preferences", ], ) @@ -65,9 +65,9 @@ cc_test( shard_count = 16, deps = [ ":common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -81,8 +81,8 @@ cc_test( shard_count = 16, deps = [ ":common", - "//fastpair/proto:fastpair_cc_proto", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -97,7 +97,7 @@ cc_test( shard_count = 16, deps = [ ":common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -112,7 +112,7 @@ cc_test( shard_count = 16, deps = [ ":common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -127,7 +127,7 @@ cc_test( shard_count = 16, deps = [ ":common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -142,7 +142,7 @@ cc_test( shard_count = 16, deps = [ ":common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/fastpair/common/fast_pair_device_test.cc b/fastpair/common/fast_pair_device_test.cc index 36010f75d1..cca5b402f3 100644 --- a/fastpair/common/fast_pair_device_test.cc +++ b/fastpair/common/fast_pair_device_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "fastpair/common/account_key.h" #include "fastpair/common/device_metadata.h" diff --git a/fastpair/common/fast_pair_switches_test.cc b/fastpair/common/fast_pair_switches_test.cc index b085cb2bba..542c0e2f59 100644 --- a/fastpair/common/fast_pair_switches_test.cc +++ b/fastpair/common/fast_pair_switches_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/fastpair/crypto/BUILD b/fastpair/crypto/BUILD index ffa91bf518..169c741b66 100644 --- a/fastpair/crypto/BUILD +++ b/fastpair/crypto/BUILD @@ -29,15 +29,15 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/common", - "//internal/base:bluetooth_address", - "//internal/platform:base", - "//internal/platform:types", + "//third_party/absl/log:check", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", "@boringssl//:crypto", - "@com_google_absl//absl/log:check", ], ) @@ -50,7 +50,7 @@ cc_test( shard_count = 1, deps = [ ":crypto", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -65,7 +65,7 @@ cc_test( shard_count = 1, deps = [ ":crypto", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -80,7 +80,7 @@ cc_test( shard_count = 1, deps = [ ":crypto", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -95,10 +95,10 @@ cc_test( shard_count = 1, deps = [ ":crypto", - "//fastpair/common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -112,7 +112,7 @@ cc_test( shard_count = 1, deps = [ ":crypto", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -127,7 +127,7 @@ cc_test( shard_count = 1, deps = [ ":crypto", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/fastpair/crypto/fast_pair_key_pair_test.cc b/fastpair/crypto/fast_pair_key_pair_test.cc index 7e76b21076..8567d0f810 100644 --- a/fastpair/crypto/fast_pair_key_pair_test.cc +++ b/fastpair/crypto/fast_pair_key_pair_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/fastpair/dataparser/BUILD b/fastpair/dataparser/BUILD index dea9c0bec3..6cf75d148c 100644 --- a/fastpair/dataparser/BUILD +++ b/fastpair/dataparser/BUILD @@ -23,17 +23,17 @@ cc_library( "fast_pair_data_parser.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":decoder", - "//fastpair/common", - "//fastpair/crypto", - "//internal/base:bluetooth_address", - "//internal/platform:base", - "//internal/platform:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", ], ) @@ -46,10 +46,10 @@ cc_library( "fast_pair_decoder.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "@com_google_absl//absl/strings", + "//third_party/absl/strings", ], ) @@ -62,15 +62,15 @@ cc_test( shard_count = 16, deps = [ ":dataparser", - "//fastpair/common", - "//fastpair/crypto", - "//fastpair/testing", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/fastpair/testing", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@boringssl//:crypto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -84,10 +84,10 @@ cc_test( shard_count = 16, deps = [ ":decoder", - "//fastpair/testing", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/fastpair/testing", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/dataparser/fast_pair_decoder_test.cc b/fastpair/dataparser/fast_pair_decoder_test.cc index 2c48a1c61e..3e81adfc23 100644 --- a/fastpair/dataparser/fast_pair_decoder_test.cc +++ b/fastpair/dataparser/fast_pair_decoder_test.cc @@ -22,7 +22,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" #include "fastpair/testing/fast_pair_service_data_creator.h" diff --git a/fastpair/fast_pair_controller_test.cc b/fastpair/fast_pair_controller_test.cc index 53d9642d7b..f463135131 100644 --- a/fastpair/fast_pair_controller_test.cc +++ b/fastpair/fast_pair_controller_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" #include "fastpair/message_stream/fake_provider.h" diff --git a/fastpair/fast_pair_service_test.cc b/fastpair/fast_pair_service_test.cc index 7ab94f97fa..630915871b 100644 --- a/fastpair/fast_pair_service_test.cc +++ b/fastpair/fast_pair_service_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "fastpair/fast_pair_events.h" #include "fastpair/internal/fast_pair_seeker_impl.h" diff --git a/fastpair/handshake/BUILD b/fastpair/handshake/BUILD index c845dac1c7..1407a87412 100644 --- a/fastpair/handshake/BUILD +++ b/fastpair/handshake/BUILD @@ -33,26 +33,26 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/common", - "//fastpair/crypto", - "//fastpair/dataparser", - "//fastpair/internal/mediums", - "//fastpair/repository", - "//internal/base:bluetooth_address", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform:uuid", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/fastpair/dataparser", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", "@boringssl//:crypto", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", ], ) @@ -63,13 +63,13 @@ cc_library( "fake_fast_pair_gatt_service_client.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":handshake", - "//fastpair/common", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", ], ) @@ -82,18 +82,18 @@ cc_test( shard_count = 16, deps = [ ":handshake", - "//fastpair/common", - "//fastpair/crypto", - "//fastpair/dataparser", - "//fastpair/internal/mediums", - "//fastpair/repository:test_support", - "//fastpair/testing", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/functional:bind_front", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/fastpair/dataparser", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/fastpair/testing", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -108,20 +108,20 @@ cc_test( deps = [ ":handshake", ":test_support", - "//fastpair/common", - "//fastpair/internal/mediums", - "//fastpair/testing", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/testing", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -136,17 +136,17 @@ cc_test( deps = [ ":handshake", ":test_support", - "//fastpair/common", - "//fastpair/crypto", - "//fastpair/proto:fastpair_cc_proto", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -160,13 +160,13 @@ cc_test( shard_count = 16, deps = [ ":handshake", - "//fastpair/common", - "//fastpair/internal/mediums", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/handshake/fast_pair_gatt_service_client_impl_test.cc b/fastpair/handshake/fast_pair_gatt_service_client_impl_test.cc index 3d5b30948c..ac4601d738 100644 --- a/fastpair/handshake/fast_pair_gatt_service_client_impl_test.cc +++ b/fastpair/handshake/fast_pair_gatt_service_client_impl_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" diff --git a/fastpair/internal/BUILD b/fastpair/internal/BUILD index ac7411c859..40fa1f7ffd 100644 --- a/fastpair/internal/BUILD +++ b/fastpair/internal/BUILD @@ -21,22 +21,22 @@ cc_library( "fast_pair_seeker_impl.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair:fast_pair_controller", - "//fastpair:fast_pair_events", - "//fastpair:fast_pair_seeker", - "//fastpair/common", - "//fastpair/internal/mediums", - "//fastpair/pairing", - "//fastpair/repository", - "//fastpair/repository:device_repository", - "//fastpair/retroactive", - "//fastpair/scanning:scanner", - "//internal/platform:types", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/status", + "//third_party/absl/strings:str_format", + "//third_party/nearby/fastpair:fast_pair_controller", + "//third_party/nearby/fastpair:fast_pair_events", + "//third_party/nearby/fastpair:fast_pair_seeker", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/pairing", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/fastpair/retroactive", + "//third_party/nearby/fastpair/scanning:scanner", + "//third_party/nearby/internal/platform:types", ], ) @@ -48,22 +48,22 @@ cc_test( ], deps = [ ":internal", - "//fastpair:fast_pair_events", - "//fastpair:fast_pair_seeker", - "//fastpair/common", - "//fastpair/message_stream:fake_gatt_callbacks", - "//fastpair/message_stream:fake_provider", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/repository", - "//fastpair/repository:device_repository", - "//fastpair/repository:test_support", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/fastpair:fast_pair_events", + "//third_party/nearby/fastpair:fast_pair_seeker", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/message_stream:fake_gatt_callbacks", + "//third_party/nearby/fastpair/message_stream:fake_provider", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/internal/fast_pair_seeker_impl_test.cc b/fastpair/internal/fast_pair_seeker_impl_test.cc index f49f262b1a..c7c23fbe85 100644 --- a/fastpair/internal/fast_pair_seeker_impl_test.cc +++ b/fastpair/internal/fast_pair_seeker_impl_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/escaping.h" diff --git a/fastpair/internal/mediums/BUILD b/fastpair/internal/mediums/BUILD index 589e600408..06608092d6 100644 --- a/fastpair/internal/mediums/BUILD +++ b/fastpair/internal/mediums/BUILD @@ -32,18 +32,18 @@ cc_library( "robust_gatt_client.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/common", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", ], ) @@ -56,7 +56,7 @@ cc_test( shard_count = 16, deps = [ ":mediums", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -71,7 +71,7 @@ cc_test( shard_count = 16, deps = [ ":mediums", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -86,14 +86,14 @@ cc_test( shard_count = 16, deps = [ ":mediums", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -107,7 +107,7 @@ cc_test( shard_count = 16, deps = [ ":mediums", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -122,10 +122,10 @@ cc_test( shard_count = 16, deps = [ ":mediums", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -139,13 +139,13 @@ cc_test( ], deps = [ ":mediums", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/internal/mediums/robust_gatt_client_test.cc b/fastpair/internal/mediums/robust_gatt_client_test.cc index 37cb674578..60a4354d15 100644 --- a/fastpair/internal/mediums/robust_gatt_client_test.cc +++ b/fastpair/internal/mediums/robust_gatt_client_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/time/clock.h" diff --git a/fastpair/internal/test/BUILD b/fastpair/internal/test/BUILD index 86c35257e9..596476cd76 100644 --- a/fastpair/internal/test/BUILD +++ b/fastpair/internal/test/BUILD @@ -24,10 +24,10 @@ cc_library( ], visibility = ["//visibility:private"], deps = [ - "//internal/network:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/nearby/internal/network:types", ], ) @@ -43,14 +43,14 @@ cc_test( ], deps = [ ":nearby_fastpair_test", - "//internal/network:types", - "//internal/platform/implementation/g3", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/platform/implementation/g3", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/message_stream/BUILD b/fastpair/message_stream/BUILD index acc4504c10..733b61486a 100644 --- a/fastpair/message_stream/BUILD +++ b/fastpair/message_stream/BUILD @@ -27,19 +27,19 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/common", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform/implementation:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/log:check", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -52,21 +52,21 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":fake_gatt_callbacks", ":message_stream", - "//fastpair/common", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform:uuid", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", "@boringssl//:crypto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_for_library_testonly", ], ) @@ -79,15 +79,15 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//internal/platform:comm", - "//internal/platform:types", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", ], ) @@ -97,16 +97,16 @@ cc_library( hdrs = [ "fake_medium_observer.h", ], - visibility = ["//fastpair:__subpackages__"], + visibility = ["//third_party/nearby/fastpair:__subpackages__"], deps = [ ":message_stream", - "//fastpair/common", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", "@com_google_googletest//:gtest_for_library_testonly", ], ) @@ -121,16 +121,16 @@ cc_test( ":fake_medium_observer", ":fake_provider", ":message_stream", - "//fastpair/common", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep "//testing/fuzzing:fuzztest", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -145,17 +145,17 @@ cc_test( ":fake_medium_observer", ":fake_provider", ":message_stream", - "//fastpair/common", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:types", - "//internal/platform/implementation/g3", # build_cleaner: keep "//testing/fuzzing:fuzztest", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/message_stream/medium_test.cc b/fastpair/message_stream/medium_test.cc index a23208f6b2..f6b37b3c8b 100644 --- a/fastpair/message_stream/medium_test.cc +++ b/fastpair/message_stream/medium_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "testing/fuzzing/fuzztest.h" #include "absl/status/status.h" diff --git a/fastpair/message_stream/message_stream_test.cc b/fastpair/message_stream/message_stream_test.cc index 3ec6fc8173..597d228f76 100644 --- a/fastpair/message_stream/message_stream_test.cc +++ b/fastpair/message_stream/message_stream_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "testing/fuzzing/fuzztest.h" #include "absl/status/status.h" diff --git a/fastpair/pairing/BUILD b/fastpair/pairing/BUILD index 24c8cd809b..f7d83cea8d 100644 --- a/fastpair/pairing/BUILD +++ b/fastpair/pairing/BUILD @@ -23,19 +23,19 @@ cc_library( "pairer_broker.h", "pairer_broker_impl.h", ], - visibility = ["//fastpair:__subpackages__"], + visibility = ["//third_party/nearby/fastpair:__subpackages__"], deps = [ - "//fastpair/common", - "//fastpair/handshake", - "//fastpair/internal/mediums", - "//fastpair/pairing/fastpair:pairing", - "//internal/base", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/synchronization", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:bind_front", + "//third_party/absl/synchronization", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/handshake", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/pairing/fastpair:pairing", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -48,25 +48,25 @@ cc_test( shard_count = 16, deps = [ ":pairing", - "//fastpair/common", - "//fastpair/crypto", - "//fastpair/handshake", - "//fastpair/handshake:test_support", - "//fastpair/internal/mediums", - "//fastpair/pairing/fastpair:pairing", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/repository:test_support", - "//internal/account", - "//internal/auth:credential", - "//internal/base:bluetooth_address", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", + "//third_party/absl/functional:bind_front", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/fastpair/handshake", + "//third_party/nearby/fastpair/handshake:test_support", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/pairing/fastpair:pairing", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/internal/account", + "//third_party/nearby/internal/auth:credential", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", "@boringssl//:crypto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/functional:bind_front", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/pairing/fastpair/BUILD b/fastpair/pairing/fastpair/BUILD index b38927424b..5477c8f800 100644 --- a/fastpair/pairing/fastpair/BUILD +++ b/fastpair/pairing/fastpair/BUILD @@ -23,19 +23,19 @@ cc_library( "fast_pair_pairer.h", "fast_pair_pairer_impl.h", ], - visibility = ["//fastpair:__subpackages__"], + visibility = ["//third_party/nearby/fastpair:__subpackages__"], deps = [ - "//fastpair/common", - "//fastpair/crypto", - "//fastpair/handshake", - "//fastpair/internal/mediums", - "//fastpair/repository", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/time", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/fastpair/handshake", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -48,27 +48,27 @@ cc_test( shard_count = 16, deps = [ ":pairing", - "//fastpair/common", - "//fastpair/crypto", - "//fastpair/handshake", - "//fastpair/handshake:test_support", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/repository:test_support", - "//internal/account", - "//internal/auth:credential", - "//internal/base:bluetooth_address", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/crypto", + "//third_party/nearby/fastpair/handshake", + "//third_party/nearby/fastpair/handshake:test_support", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/internal/account", + "//third_party/nearby/internal/auth:credential", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", "@boringssl//:crypto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/plugins/BUILD b/fastpair/plugins/BUILD index 473b84be6c..06bc76a856 100644 --- a/fastpair/plugins/BUILD +++ b/fastpair/plugins/BUILD @@ -15,7 +15,7 @@ package_group( name = "nearby_fastpair", packages = [ - "//fastpair/...", + "//third_party/nearby/fastpair/...", ], ) @@ -24,11 +24,11 @@ cc_library( hdrs = ["fake_initial_pair_plugin.h"], visibility = ["//visibility:private"], deps = [ - "//fastpair:fast_pair_events", - "//fastpair:fast_pair_plugin", - "//fastpair:fast_pair_seeker", - "//fastpair/common", - "//internal/platform:types", + "//third_party/nearby/fastpair:fast_pair_events", + "//third_party/nearby/fastpair:fast_pair_plugin", + "//third_party/nearby/fastpair:fast_pair_seeker", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:types", ], ) @@ -38,13 +38,13 @@ cc_library( hdrs = ["windows_admin_plugin.h"], visibility = ["//:__subpackages__"], deps = [ - "//fastpair:fast_pair_events", - "//fastpair:fast_pair_plugin", - "//fastpair:fast_pair_seeker", - "//fastpair:fast_pair_service", - "//fastpair/common", - "//fastpair/ui:fast_pair_ui", - "//internal/platform:types", + "//third_party/nearby/fastpair:fast_pair_events", + "//third_party/nearby/fastpair:fast_pair_plugin", + "//third_party/nearby/fastpair:fast_pair_seeker", + "//third_party/nearby/fastpair:fast_pair_service", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/ui:fast_pair_ui", + "//third_party/nearby/internal/platform:types", ], ) @@ -56,11 +56,11 @@ cc_test( ], deps = [ ":fake_initial_pair_plugin", - "//fastpair:test_support", - "//fastpair/common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/nearby/fastpair:test_support", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ], ) @@ -73,13 +73,13 @@ cc_library( "fake_fast_pair_plugin.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair:fast_pair_events", - "//fastpair:fast_pair_plugin", - "//fastpair:fast_pair_seeker", - "//fastpair/common", - "@com_google_absl//absl/functional:any_invocable", + "//third_party/absl/functional:any_invocable", + "//third_party/nearby/fastpair:fast_pair_events", + "//third_party/nearby/fastpair:fast_pair_plugin", + "//third_party/nearby/fastpair:fast_pair_seeker", + "//third_party/nearby/fastpair/common", ], ) diff --git a/fastpair/plugins/fake_initial_pair_plugin_test.cc b/fastpair/plugins/fake_initial_pair_plugin_test.cc index 0a8856279d..1b9f991281 100644 --- a/fastpair/plugins/fake_initial_pair_plugin_test.cc +++ b/fastpair/plugins/fake_initial_pair_plugin_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "fastpair/common/protocol.h" diff --git a/fastpair/proto/BUILD b/fastpair/proto/BUILD index 3c80774ad2..e386ea6095 100644 --- a/fastpair/proto/BUILD +++ b/fastpair/proto/BUILD @@ -27,14 +27,14 @@ proto_library( "fastpair_rpcs.proto", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], ) cc_proto_library( name = "fastpair_cc_proto", visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [":fastpair_proto"], ) @@ -50,9 +50,9 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":fastpair_cc_proto", - "//fastpair/common", - "//internal/platform:types", - "@com_google_absl//absl/strings", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:types", "@nlohmann_json//:json", ], ) @@ -68,10 +68,10 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":fastpair_cc_proto", - "//fastpair/common", - "//fastpair/repository", - "//internal/platform:types", - "@com_google_absl//absl/time", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/internal/platform:types", ], ) @@ -86,10 +86,10 @@ cc_test( deps = [ ":fastpair_cc_proto", ":proto_builder", - "//fastpair/common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/repository/BUILD b/fastpair/repository/BUILD index bc10943c88..6fca334b4b 100644 --- a/fastpair/repository/BUILD +++ b/fastpair/repository/BUILD @@ -25,14 +25,14 @@ cc_library( copts = [ "-Ithird_party", ], - visibility = ["//fastpair:__subpackages__"], + visibility = ["//third_party/nearby/fastpair:__subpackages__"], deps = [ - "//fastpair/common", - "//fastpair/proto:fastpair_cc_proto", - "//internal/base:bluetooth_address", - "//internal/crypto_cros", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/crypto_cros", ], ) @@ -47,17 +47,17 @@ cc_library( copts = [ "-Ithird_party", ], - visibility = ["//fastpair:__subpackages__"], + visibility = ["//third_party/nearby/fastpair:__subpackages__"], deps = [ ":repository", - "//fastpair/common", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/proto:proto_builder", - "//fastpair/server_access", - "//internal/base", - "//internal/platform:types", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/proto:proto_builder", + "//third_party/nearby/fastpair/server_access", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", ], ) @@ -69,12 +69,12 @@ cc_library( hdrs = [ "fast_pair_device_repository.h", ], - visibility = ["//fastpair:__subpackages__"], + visibility = ["//third_party/nearby/fastpair:__subpackages__"], deps = [ - "//fastpair/common", - "//internal/base", - "//internal/platform:types", - "@com_google_absl//absl/functional:any_invocable", + "//third_party/absl/functional:any_invocable", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", ], ) @@ -85,17 +85,17 @@ cc_library( "fake_fast_pair_repository.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":repository", - "//fastpair/common", - "//fastpair/proto:fastpair_cc_proto", - "//internal/base", - "//internal/platform:types", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", ], ) @@ -106,11 +106,11 @@ cc_library( "mock_fast_pair_repository.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":repository", - "@com_google_absl//absl/strings", + "//third_party/absl/strings", "@com_google_googletest//:gtest_for_library_testonly", ], ) @@ -122,11 +122,11 @@ cc_test( ], deps = [ ":device_repository", - "//fastpair/common", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings:string_view", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", ], ) @@ -141,10 +141,10 @@ cc_test( ], deps = [ ":repository", - "//fastpair/common", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -159,14 +159,14 @@ cc_test( ], deps = [ ":repository_impl", - "//fastpair/common", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/proto:proto_builder", - "//fastpair/server_access:test_support", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/proto:proto_builder", + "//third_party/nearby/fastpair/server_access:test_support", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/repository/fast_pair_repository_impl_test.cc b/fastpair/repository/fast_pair_repository_impl_test.cc index a0374410a1..39f4f182f3 100644 --- a/fastpair/repository/fast_pair_repository_impl_test.cc +++ b/fastpair/repository/fast_pair_repository_impl_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "fastpair/common/device_metadata.h" diff --git a/fastpair/retroactive/BUILD b/fastpair/retroactive/BUILD index ccfc6b9a60..291d7a1ecb 100644 --- a/fastpair/retroactive/BUILD +++ b/fastpair/retroactive/BUILD @@ -27,25 +27,25 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair:fast_pair_controller", - "//fastpair/common", - "//fastpair/internal/mediums", - "//fastpair/message_stream", - "//fastpair/pairing", - "//fastpair/repository", - "//fastpair/repository:device_repository", - "//internal/base", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/status", + "//third_party/absl/strings", "//third_party/magic_enum", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "//third_party/nearby/fastpair:fast_pair_controller", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/message_stream", + "//third_party/nearby/fastpair/pairing", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -57,20 +57,20 @@ cc_test( ], deps = [ ":retroactive", - "//fastpair/common", - "//fastpair/message_stream:fake_gatt_callbacks", - "//fastpair/message_stream:fake_provider", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/repository:test_support", - "//internal/base:bluetooth_address", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/message_stream:fake_gatt_callbacks", + "//third_party/nearby/fastpair/message_stream:fake_provider", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/retroactive/retroactive_test.cc b/fastpair/retroactive/retroactive_test.cc index 0172f6b500..7986c426cb 100644 --- a/fastpair/retroactive/retroactive_test.cc +++ b/fastpair/retroactive/retroactive_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/escaping.h" diff --git a/fastpair/scanning/BUILD b/fastpair/scanning/BUILD index c4b3588792..4cdb62756c 100644 --- a/fastpair/scanning/BUILD +++ b/fastpair/scanning/BUILD @@ -25,16 +25,16 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/common", - "//fastpair/internal/mediums", - "//fastpair/repository:device_repository", - "//fastpair/scanning/fastpair:scanning", - "//internal/base", - "//internal/platform:types", - "@com_google_absl//absl/functional:bind_front", + "//third_party/absl/functional:bind_front", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/fastpair/scanning/fastpair:scanning", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", ], ) @@ -45,12 +45,12 @@ cc_library( "mock_scanner_broker.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":scanner", - "//fastpair/common", - "//internal/base", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/base", "@com_google_googletest//:gtest_for_library_testonly", ], ) @@ -64,18 +64,18 @@ cc_test( shard_count = 16, deps = [ ":scanner", - "//fastpair/common", - "//fastpair/internal/mediums", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/repository:device_repository", - "//fastpair/repository:test_support", - "//fastpair/testing", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/fastpair/testing", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/scanning/fastpair/BUILD b/fastpair/scanning/fastpair/BUILD index f70cd686ea..f2609d163c 100644 --- a/fastpair/scanning/fastpair/BUILD +++ b/fastpair/scanning/fastpair/BUILD @@ -29,23 +29,23 @@ cc_library( ], visibility = [ "//:__subpackages__", - "//fastpair/scanning:__subpackages__", + "//third_party/nearby/fastpair/scanning:__subpackages__", ], deps = [ - "//fastpair/common", - "//fastpair/dataparser", - "//fastpair/internal/mediums", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/repository", - "//fastpair/repository:device_repository", - "//internal/base", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/dataparser", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", ], ) @@ -58,13 +58,13 @@ cc_library( "fake_fast_pair_scanner.h", ], visibility = [ - "//fastpair/scanning:__subpackages__", + "//third_party/nearby/fastpair/scanning:__subpackages__", ], deps = [ ":scanning", - "//fastpair/common", - "//internal/base", - "@com_google_absl//absl/functional:any_invocable", + "//third_party/absl/functional:any_invocable", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/base", ], ) @@ -77,16 +77,16 @@ cc_test( shard_count = 16, deps = [ ":scanning", - "//fastpair/common", - "//fastpair/internal/mediums", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/internal/mediums", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -101,13 +101,13 @@ cc_test( deps = [ ":scanning", ":test_support", - "//fastpair/repository:device_repository", - "//fastpair/repository:test_support", - "//fastpair/testing", - "//internal/platform:comm", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/synchronization", + "//third_party/nearby/fastpair/repository:device_repository", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/fastpair/testing", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", "@com_google_googletest//:gtest_main", ], ) @@ -122,10 +122,10 @@ cc_test( deps = [ ":scanning", ":test_support", - "//fastpair/common", - "//fastpair/repository:test_support", - "//fastpair/testing", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/repository:test_support", + "//third_party/nearby/fastpair/testing", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/fastpair/server_access/BUILD b/fastpair/server_access/BUILD index e4fa40f466..572fb106a9 100644 --- a/fastpair/server_access/BUILD +++ b/fastpair/server_access/BUILD @@ -26,25 +26,25 @@ cc_library( "fast_pair_http_notifier.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/common", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/proto:proto_to_json", - "//internal/auth:credential", - "//internal/auth:types", - "//internal/base", - "//internal/network:types", - "//internal/network:url", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/proto:proto_to_json", + "//third_party/nearby/internal/auth:credential", + "//third_party/nearby/internal/auth:types", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", "@nlohmann_json//:json", ], ) @@ -55,11 +55,11 @@ cc_library( "fake_fast_pair_client.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":server_access", - "//fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", ], ) @@ -73,8 +73,8 @@ cc_test( ], deps = [ ":server_access", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -90,24 +90,24 @@ cc_test( ], deps = [ ":server_access", - "//fastpair/common", - "//fastpair/proto:fastpair_cc_proto", - "//fastpair/proto:proto_builder", - "//internal/auth:credential", - "//internal/auth:types", - "//internal/network:types", - "//internal/network:url", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/test", - "//internal/test/google3_only:test", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/log:check", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:string_view", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/fastpair/proto:proto_builder", + "//third_party/nearby/internal/auth:credential", + "//third_party/nearby/internal/auth:types", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/internal/test/google3_only:test", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", ], ) diff --git a/fastpair/server_access/fast_pair_client_impl_test.cc b/fastpair/server_access/fast_pair_client_impl_test.cc index e8b86a601e..17542a5914 100644 --- a/fastpair/server_access/fast_pair_client_impl_test.cc +++ b/fastpair/server_access/fast_pair_client_impl_test.cc @@ -23,7 +23,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/functional/any_invocable.h" #include "absl/log/check.h" diff --git a/fastpair/testing/BUILD b/fastpair/testing/BUILD index 8ab64f5fc3..47fa709498 100644 --- a/fastpair/testing/BUILD +++ b/fastpair/testing/BUILD @@ -23,9 +23,9 @@ cc_library( "fast_pair_service_data_creator.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "@com_google_absl//absl/strings", + "//third_party/absl/strings", ], ) diff --git a/fastpair/ui/BUILD b/fastpair/ui/BUILD index 9173a348ed..ae9dafffac 100644 --- a/fastpair/ui/BUILD +++ b/fastpair/ui/BUILD @@ -30,15 +30,15 @@ cc_library( "ui_broker_impl.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ - "//fastpair/common", - "//fastpair/repository", - "//internal/base", - "//internal/platform:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", ], ) @@ -50,13 +50,13 @@ cc_library( "fast_pair/fake_fast_pair_presenter.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":fast_pair_ui", - "//fastpair/common", - "//fastpair/repository", - "//internal/platform:types", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/internal/platform:types", ], ) @@ -67,14 +67,14 @@ cc_library( "mock_ui_broker.h", ], visibility = [ - "//fastpair:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", ], deps = [ ":fast_pair_ui", - "//fastpair/common", - "//fastpair/repository", - "//internal/base", "//testing/base/public:gunit_for_library", + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/repository", + "//third_party/nearby/internal/base", ], ) @@ -86,9 +86,9 @@ cc_test( deps = [ ":fake_fast_pair_ui", ":fast_pair_ui", - "//fastpair/common", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/fastpair/common", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -102,10 +102,10 @@ cc_test( deps = [ ":fake_fast_pair_ui", ":fast_pair_ui", - "//fastpair/common", - "//fastpair/proto:fastpair_cc_proto", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/fastpair/common", + "//third_party/nearby/fastpair/proto:fastpair_cc_proto", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -119,7 +119,7 @@ cc_test( deps = [ ":fake_fast_pair_ui", ":fast_pair_ui", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/fastpair/ui/fast_pair/fast_pair_presenter_impl_test.cc b/fastpair/ui/fast_pair/fast_pair_presenter_impl_test.cc index d3a00c5c06..f47b84a222 100644 --- a/fastpair/ui/fast_pair/fast_pair_presenter_impl_test.cc +++ b/fastpair/ui/fast_pair/fast_pair_presenter_impl_test.cc @@ -15,7 +15,6 @@ #include "fastpair/ui/fast_pair/fast_pair_presenter_impl.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "fastpair/common/fast_pair_device.h" #include "fastpair/proto/fastpair_rpcs.proto.h" diff --git a/internal/analytics/BUILD b/internal/analytics/BUILD index b39ce58336..9635680983 100644 --- a/internal/analytics/BUILD +++ b/internal/analytics/BUILD @@ -19,16 +19,16 @@ cc_library( "event_logger.h", ], visibility = [ - "//connections:__subpackages__", - "//fastpair:__subpackages__", "//location/nearby/analytics/cpp:__subpackages__", "//location/nearby/cpp/experiments:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//internal/proto/analytics:connections_log_cc_proto", - "//internal/proto/analytics:fast_pair_log_cc_proto", - "//sharing/proto/analytics:sharing_log_cc_proto", + "//third_party/nearby/internal/proto/analytics:connections_log_cc_proto", + "//third_party/nearby/internal/proto/analytics:fast_pair_log_cc_proto", + "//third_party/nearby/sharing/proto/analytics:sharing_log_cc_proto", ], ) diff --git a/internal/base/BUILD b/internal/base/BUILD index 689613f981..adf2ab8e97 100644 --- a/internal/base/BUILD +++ b/internal/base/BUILD @@ -22,16 +22,16 @@ cc_library( "observer_list.h", ], visibility = [ - "//fastpair:__subpackages__", - "//internal/account:__subpackages__", - "//internal/platform:__pkg__", - "//internal/test:__pkg__", - "//sharing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/account:__subpackages__", + "//third_party/nearby/internal/platform:__pkg__", + "//third_party/nearby/internal/test:__pkg__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//internal/platform:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_set", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_set", + "//third_party/nearby/internal/platform:types", ], ) @@ -44,15 +44,15 @@ cc_library( "bluetooth_address.h", ], visibility = [ - "//fastpair:__subpackages__", - "//internal:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/types:optional", + "//third_party/absl/types:span", ], ) @@ -72,9 +72,9 @@ cc_test( ], deps = [ ":bluetooth_address", + "//third_party/absl/time", + "//third_party/absl/types:span", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/crypto/BUILD b/internal/crypto/BUILD index 1f8f3d3cf7..8b6b55accf 100644 --- a/internal/crypto/BUILD +++ b/internal/crypto/BUILD @@ -28,13 +28,13 @@ cc_library( "-Ithird_party", ], deps = [ - "//internal/crypto_cros", - "//internal/platform:types", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/platform:types", "@boringssl//:crypto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", ], ) @@ -50,10 +50,10 @@ cc_test( ], deps = [ ":crypto", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/absl/strings", + "//third_party/absl/types:span", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/crypto/ed25519_unittest.cc b/internal/crypto/ed25519_unittest.cc index 97be492d9c..8092c3166f 100644 --- a/internal/crypto/ed25519_unittest.cc +++ b/internal/crypto/ed25519_unittest.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" diff --git a/internal/crypto_cros/BUILD b/internal/crypto_cros/BUILD index 86029b3bda..1431cf63b9 100644 --- a/internal/crypto_cros/BUILD +++ b/internal/crypto_cros/BUILD @@ -69,16 +69,16 @@ cc_library( "-Ithird_party", ], deps = [ + "//third_party/absl/base:core_headers", + "//third_party/absl/log", + "//third_party/absl/log:check", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/types:optional", + "//third_party/absl/types:span", "@boringssl//:crypto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", ], ) @@ -105,10 +105,10 @@ cc_test( ], deps = [ ":crypto_cros", - "//internal/platform/implementation:types", + "//third_party/absl/strings", + "//third_party/absl/types:span", + "//third_party/nearby/internal/platform/implementation:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/data/BUILD b/internal/data/BUILD index 29ed7a0eb7..da211d6f7b 100644 --- a/internal/data/BUILD +++ b/internal/data/BUILD @@ -28,14 +28,14 @@ cc_library( "leveldb_data_set.h", ], deps = [ - "//internal/platform:types", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/absl/synchronization", "//third_party/leveldb:db", "//third_party/leveldb:table", "//third_party/leveldb:util", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", + "//third_party/nearby/internal/platform:types", "@com_google_protobuf//:protobuf_lite", ], ) @@ -60,11 +60,11 @@ cc_test( deps = [ ":data_manager", ":leveldb_data_set_test_cc_proto", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/data/leveldb_data_set_test.cc b/internal/data/leveldb_data_set_test.cc index f1843ee208..b07257c436 100644 --- a/internal/data/leveldb_data_set_test.cc +++ b/internal/data/leveldb_data_set_test.cc @@ -26,7 +26,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/synchronization/notification.h" diff --git a/internal/flags/BUILD b/internal/flags/BUILD index ff551340dc..3e4fb9f6be 100644 --- a/internal/flags/BUILD +++ b/internal/flags/BUILD @@ -26,7 +26,7 @@ cc_library( "//location/nearby/cpp/experiments:__subpackages__", "//location/nearby/cpp/sharing:__subpackages__", ], - deps = ["@com_google_absl//absl/strings"], + deps = ["//third_party/absl/strings"], ) cc_library( @@ -49,10 +49,10 @@ cc_library( ], deps = [ ":flag_reader", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings", + "//third_party/absl/synchronization", ], ) @@ -62,8 +62,8 @@ cc_test( deps = [ ":flag_reader", ":nearby_flags", + "//third_party/absl/strings", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", ], diff --git a/internal/flags/nearby_flags_test.cc b/internal/flags/nearby_flags_test.cc index 0d82b07ef3..deb30d3cd1 100644 --- a/internal/flags/nearby_flags_test.cc +++ b/internal/flags/nearby_flags_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "internal/flags/flag.h" diff --git a/internal/interop/BUILD b/internal/interop/BUILD index 5198eb8ae2..f7cbef1c88 100644 --- a/internal/interop/BUILD +++ b/internal/interop/BUILD @@ -21,7 +21,7 @@ cc_library( "//:__subpackages__", ], deps = [ - "@com_google_absl//absl/strings", + "//third_party/absl/strings", ], ) @@ -32,17 +32,17 @@ cc_library( "device_provider.h", ], visibility = [ - "//connections:__subpackages__", - "//connections:partners", - "//presence:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/connections:partners", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":authentication_status", ":authentication_transport_interface", - "//internal/platform:connection_info", - "//internal/platform:types", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:variant", + "//third_party/absl/strings", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/platform:connection_info", + "//third_party/nearby/internal/platform:types", ], ) @@ -52,9 +52,9 @@ cc_library( "authentication_status.h", ], visibility = [ - "//connections:__subpackages__", - "//presence:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/presence:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], ) @@ -69,12 +69,12 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":authentication_status", ":authentication_transport_interface", ":device", - "@com_google_absl//absl/strings:string_view", + "//third_party/absl/strings:string_view", ], ) diff --git a/internal/network/BUILD b/internal/network/BUILD index 564d85d7c6..6068612ce2 100644 --- a/internal/network/BUILD +++ b/internal/network/BUILD @@ -25,16 +25,16 @@ cc_library( "utils.h", ], visibility = [ - "//fastpair:__subpackages__", - "//internal:__pkg__", - "//internal:__subpackages__", "//location/nearby/cpp/sharing:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal:__pkg__", + "//third_party/nearby/internal:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", ], ) @@ -54,21 +54,21 @@ cc_library( "http_status_code.h", ], visibility = [ - "//fastpair:__subpackages__", - "//internal:__pkg__", - "//internal:__subpackages__", "//location/nearby/cpp/sharing:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal:__pkg__", + "//third_party/nearby/internal:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":url", - "//internal/platform:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:types", ], ) @@ -84,20 +84,20 @@ cc_library( ], defines = ["_SILENCE_CLANG_COROUTINE_MESSAGE"], visibility = [ - "//fastpair:__subpackages__", - "//internal:__pkg__", - "//internal:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal:__pkg__", + "//third_party/nearby/internal:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":types", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "//third_party/absl/base:core_headers", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", ], ) @@ -118,16 +118,16 @@ cc_test( ":nearby_http_client", ":types", ":url", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/network/http_client_impl_test.cc b/internal/network/http_client_impl_test.cc index 67a4550c97..84f01b1cca 100644 --- a/internal/network/http_client_impl_test.cc +++ b/internal/network/http_client_impl_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" diff --git a/internal/network/http_request_test.cc b/internal/network/http_request_test.cc index e31aabdc3b..1330beda25 100644 --- a/internal/network/http_request_test.cc +++ b/internal/network/http_request_test.cc @@ -15,7 +15,6 @@ #include "internal/network/http_request.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/network/http_body.h" diff --git a/internal/network/http_response_test.cc b/internal/network/http_response_test.cc index 5ece8f91e5..a75c71d0e6 100644 --- a/internal/network/http_response_test.cc +++ b/internal/network/http_response_test.cc @@ -15,7 +15,6 @@ #include "internal/network/http_response.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/internal/network/url_test.cc b/internal/network/url_test.cc index f8125f637b..57893d983a 100644 --- a/internal/network/url_test.cc +++ b/internal/network/url_test.cc @@ -16,7 +16,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/internal/platform/BUILD b/internal/platform/BUILD index 6b7b3aefe4..9429629612 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -25,9 +25,9 @@ cc_library( "//:__subpackages__", ], deps = [ - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/log:globals", + "//third_party/absl/log", + "//third_party/absl/log:check", + "//third_party/absl/log:globals", ], ) @@ -63,19 +63,19 @@ cc_library( visibility = [ "//:__subpackages__", "//chrome/chromeos/assistant/data_migration/lib:__pkg__", - "//connections:partners", + "//third_party/nearby/connections:partners", ], deps = [ - "//proto:connections_enums_cc_proto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/meta:type_traits", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/meta:type_traits", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/proto:connections_enums_cc_proto", ], ) @@ -90,14 +90,14 @@ cc_library( "byte_utils.h", ], visibility = [ - "//connections:__subpackages__", - "//connections:partners", - "//internal/platform/implementation:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/connections:partners", + "//third_party/nearby/internal/platform/implementation:__subpackages__", ], deps = [ ":base", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/base:core_headers", + "//third_party/absl/strings:str_format", ], ) @@ -111,14 +111,14 @@ cc_library( "cancellation_flag_listener.h", ], visibility = [ - "//connections/implementation:__subpackages__", - "//internal/platform/implementation:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", ], deps = [ ":base", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/synchronization", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/synchronization", ], ) @@ -131,12 +131,12 @@ cc_library( "error_code_params.h", "error_code_recorder.h", ], - visibility = ["//connections/implementation:__subpackages__"], + visibility = ["//third_party/nearby/connections/implementation:__subpackages__"], deps = [ ":logging", - "//proto:connections_enums_cc_proto", - "//proto/errorcode:error_code_enums_cc_proto", - "@com_google_absl//absl/functional:any_invocable", + "//third_party/absl/functional:any_invocable", + "//third_party/nearby/proto:connections_enums_cc_proto", + "//third_party/nearby/proto/errorcode:error_code_enums_cc_proto", ], ) @@ -149,15 +149,15 @@ cc_library( "uuid.h", ], visibility = [ - "//connections/implementation:__subpackages__", - "//fastpair:__subpackages__", - "//internal/platform/implementation:__subpackages__", - "//presence:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":base", + "//third_party/absl/strings", "@boringssl//:crypto", - "@com_google_absl//absl/strings", ], ) @@ -176,19 +176,19 @@ cc_library( "wifi_lan_connection_info.h", ], visibility = [ - "//connections/implementation:__pkg__", - "//connections/v3:__pkg__", - "//internal/interop:__pkg__", - "//presence:__subpackages__", + "//third_party/nearby/connections/implementation:__pkg__", + "//third_party/nearby/connections/v3:__pkg__", + "//third_party/nearby/internal/interop:__pkg__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":logging", - "//proto:connections_enums_cc_proto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:variant", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/types:variant", + "//third_party/nearby/proto:connections_enums_cc_proto", ], ) @@ -244,49 +244,49 @@ cc_library( "timer_impl.h", ], visibility = [ - "//connections:__subpackages__", - "//fastpair:__subpackages__", - "//internal/account:__subpackages__", - "//internal/auth:__subpackages__", - "//internal/auth/credential_store:__subpackages__", - "//internal/base:__subpackages__", - "//internal/crypto:__subpackages__", - "//internal/data:__subpackages__", - "//internal/interop:__pkg__", - "//internal/network:__subpackages__", - "//internal/platform:__subpackages__", - "//internal/platform/implementation/g3:__pkg__", - "//internal/platform/implementation/windows:__subpackages__", - "//internal/preferences:__subpackages__", - "//internal/proto/analytics:__subpackages__", - "//internal/test:__subpackages__", - "//internal/weave:__subpackages__", "//location/nearby/apps:__subpackages__", "//location/nearby/cpp:__subpackages__", "//location/nearby/sharing/sdk:__subpackages__", "//location/nearby/testing/nearby_native:__subpackages__", - "//presence:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/account:__subpackages__", + "//third_party/nearby/internal/auth:__subpackages__", + "//third_party/nearby/internal/auth/credential_store:__subpackages__", + "//third_party/nearby/internal/base:__subpackages__", + "//third_party/nearby/internal/crypto:__subpackages__", + "//third_party/nearby/internal/data:__subpackages__", + "//third_party/nearby/internal/interop:__pkg__", + "//third_party/nearby/internal/network:__subpackages__", + "//third_party/nearby/internal/platform:__subpackages__", + "//third_party/nearby/internal/platform/implementation/g3:__pkg__", + "//third_party/nearby/internal/platform/implementation/windows:__subpackages__", + "//third_party/nearby/internal/preferences:__subpackages__", + "//third_party/nearby/internal/proto/analytics:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/internal/weave:__subpackages__", + "//third_party/nearby/presence:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":base", ":util", - "//internal/base:files", - "//internal/crypto_cros", - "//internal/flags:nearby_flags", - "//internal/platform/flags:platform_flags", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/log:globals", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/log", + "//third_party/absl/log:check", + "//third_party/absl/log:globals", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/base:files", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform/flags:platform_flags", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -319,28 +319,28 @@ cc_library( "-DNO_WEBRTC", ], visibility = [ - "//connections:__subpackages__", - "//fastpair:__subpackages__", - "//internal/platform/implementation:__subpackages__", - "//internal/test:__subpackages__", - "//presence:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":base", ":cancellation_flag", ":types", ":uuid", - "//internal/base", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:wifi_utils", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/types:optional", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:wifi_utils", # TODO: Support WebRTC - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", ], ) @@ -354,26 +354,26 @@ cc_library( "medium_environment.h", ], visibility = [ - "//connections:__subpackages__", - "//fastpair:__subpackages__", - "//internal/platform/implementation:__subpackages__", - "//presence:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":base", ":types", ":uuid", - "//internal/base", - "//internal/platform/implementation:comm", - "//internal/test", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/test", ], ) @@ -389,11 +389,11 @@ cc_test( deps = [ ":base", ":test_util", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/hash:hash_testing", + "//third_party/absl/strings:string_view", + "//third_party/absl/synchronization", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/hash:hash_testing", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/synchronization", "@com_google_googletest//:gtest_main", ], ) @@ -420,7 +420,7 @@ cc_test( ":base", ":cancellation_flag", ":test_util", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -431,7 +431,7 @@ cc_test( srcs = ["expected_test.cc"], deps = [ ":base", - "//proto:connections_enums_cc_proto", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -445,7 +445,7 @@ cc_test( deps = [ ":error_code_recorder", ":test_util", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -476,13 +476,13 @@ cc_test( ":connection_info", ":test_util", ":types", - "//internal/platform/implementation:comm", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//proto:connections_enums_cc_proto", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -492,13 +492,13 @@ cc_test( srcs = ["credential_storage_impl_test.cc"], deps = [ ":comm", - "//internal/platform/implementation:comm", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//internal/proto:credential_cc_proto", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings:string_view", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/proto:credential_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", ], ) @@ -535,29 +535,29 @@ cc_test( ":test_util", ":types", ":uuid", - "//internal/crypto_cros", - "//internal/flags:nearby_flags", - "//internal/platform/flags:platform_flags", - "//internal/platform/implementation:comm", - "//internal/proto:credential_cc_proto", - "//internal/test", - "//proto:connections_enums_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/log", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform/flags:platform_flags", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/test", + "//third_party/nearby/proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) diff --git a/internal/platform/ble_connection_info_test.cc b/internal/platform/ble_connection_info_test.cc index e27f2bd61c..32768f6642 100644 --- a/internal/platform/ble_connection_info_test.cc +++ b/internal/platform/ble_connection_info_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" diff --git a/internal/platform/ble_test.cc b/internal/platform/ble_test.cc index 20ecce7363..29e28fe0d5 100644 --- a/internal/platform/ble_test.cc +++ b/internal/platform/ble_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/bluetooth_adapter.h" #include "internal/platform/byte_array.h" diff --git a/internal/platform/ble_v2_test.cc b/internal/platform/ble_v2_test.cc index 040eba7616..00a94d49fe 100644 --- a/internal/platform/ble_v2_test.cc +++ b/internal/platform/ble_v2_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "internal/platform/bluetooth_adapter.h" diff --git a/internal/platform/bluetooth_adapter_test.cc b/internal/platform/bluetooth_adapter_test.cc index 5ded6e0868..f2e73436bf 100644 --- a/internal/platform/bluetooth_adapter_test.cc +++ b/internal/platform/bluetooth_adapter_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/bluetooth_utils.h" #include "internal/platform/logging.h" diff --git a/internal/platform/bluetooth_connection_info_test.cc b/internal/platform/bluetooth_connection_info_test.cc index 072731d9c3..b75d3e7326 100644 --- a/internal/platform/bluetooth_connection_info_test.cc +++ b/internal/platform/bluetooth_connection_info_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" diff --git a/internal/platform/borrowable_test.cc b/internal/platform/borrowable_test.cc index 896e33a49c..f90e3f4dc9 100644 --- a/internal/platform/borrowable_test.cc +++ b/internal/platform/borrowable_test.cc @@ -15,7 +15,6 @@ #include "internal/platform/borrowable.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/clock.h" #include "absl/time/time.h" diff --git a/internal/platform/cancellation_flag_test.cc b/internal/platform/cancellation_flag_test.cc index 6dd1dae650..c52b3be12c 100644 --- a/internal/platform/cancellation_flag_test.cc +++ b/internal/platform/cancellation_flag_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/cancellation_flag_listener.h" #include "internal/platform/feature_flags.h" diff --git a/internal/platform/connection_info_test.cc b/internal/platform/connection_info_test.cc index ff4a637245..77b7d79f50 100644 --- a/internal/platform/connection_info_test.cc +++ b/internal/platform/connection_info_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" diff --git a/internal/platform/credential_storage_impl_test.cc b/internal/platform/credential_storage_impl_test.cc index 3089c046c4..667d38f0a3 100644 --- a/internal/platform/credential_storage_impl_test.cc +++ b/internal/platform/credential_storage_impl_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/internal/platform/crypto_test.cc b/internal/platform/crypto_test.cc index e6e1dff1dc..b65830ae1b 100644 --- a/internal/platform/crypto_test.cc +++ b/internal/platform/crypto_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/crypto_cros/nearby_base.h" #include "internal/platform/byte_array.h" diff --git a/internal/platform/error_code_recorder_test.cc b/internal/platform/error_code_recorder_test.cc index 0daf676e8c..82c378adae 100644 --- a/internal/platform/error_code_recorder_test.cc +++ b/internal/platform/error_code_recorder_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/internal/platform/exception_test.cc b/internal/platform/exception_test.cc index 650ba5617d..b2360ea88e 100644 --- a/internal/platform/exception_test.cc +++ b/internal/platform/exception_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/exception_test.nc.h" diff --git a/internal/platform/flags/BUILD b/internal/platform/flags/BUILD index 8be880bfbc..270bf7dd43 100644 --- a/internal/platform/flags/BUILD +++ b/internal/platform/flags/BUILD @@ -19,14 +19,14 @@ cc_library( "nearby_platform_feature_flags.h", ], visibility = [ - "//fastpair:__subpackages__", - "//internal:__subpackages__", "//location/nearby/cpp:__subpackages__", "//location/nearby/sharing:__subpackages__", "//location/nearby/testing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal:__subpackages__", ], deps = [ - "//internal/flags:flag_reader", - "@com_google_absl//absl/strings", + "//third_party/absl/strings", + "//third_party/nearby/internal/flags:flag_reader", ], ) diff --git a/internal/platform/implementation/BUILD b/internal/platform/implementation/BUILD index 7052b07e8a..bf9a522d4a 100644 --- a/internal/platform/implementation/BUILD +++ b/internal/platform/implementation/BUILD @@ -17,11 +17,11 @@ cc_library( name = "auth_status", hdrs = ["auth_status.h"], visibility = [ - "//internal/auth:__pkg__", - "//internal/platform/implementation:__subpackages__", - "//internal/test:__subpackages__", "//location/nearby/cpp/sharing/clients/cpp:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/internal/auth:__pkg__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], ) @@ -29,12 +29,12 @@ cc_library( name = "account_info", hdrs = ["account_info.h"], visibility = [ - "//internal/account:__pkg__", - "//internal/auth:__pkg__", - "//internal/platform/implementation:__subpackages__", - "//internal/test:__subpackages__", "//location/nearby/cpp/sharing/clients/cpp:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/internal/account:__pkg__", + "//third_party/nearby/internal/auth:__pkg__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], ) @@ -42,20 +42,20 @@ cc_library( name = "account_manager", hdrs = ["account_manager.h"], visibility = [ - "//fastpair:__subpackages__", - "//internal/account:__pkg__", - "//internal/platform/implementation:__subpackages__", - "//internal/test:__subpackages__", "//location/nearby/cpp/sharing/clients/cpp:__subpackages__", "//location/nearby/sharing/sdk/quick_share_server:__pkg__", - "//sharing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/account:__pkg__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":account_info", ":signin_attempt", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings:string_view", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/strings:string_view", ], ) @@ -63,19 +63,19 @@ cc_library( name = "signin_attempt", hdrs = ["signin_attempt.h"], visibility = [ - "//internal/account:__pkg__", - "//internal/auth:__pkg__", - "//internal/platform/implementation:__subpackages__", - "//internal/test:__subpackages__", "//location/nearby/cpp/sharing/clients/cpp:__subpackages__", "//location/nearby/sharing/sdk/quick_share_server:__pkg__", - "//sharing:__subpackages__", + "//third_party/nearby/internal/account:__pkg__", + "//third_party/nearby/internal/auth:__pkg__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":account_info", ":auth_status", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings:string_view", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings:string_view", ], ) @@ -105,28 +105,28 @@ cc_library( "timer.h", ], visibility = [ - "//connections/implementation:__subpackages__", - "//connections/implementation/analytics:__subpackages__", - "//fastpair:__subpackages__", - "//internal/crypto_cros:__pkg__", - "//internal/platform:__pkg__", - "//internal/platform/implementation:__subpackages__", - "//internal/preferences:__subpackages__", - "//internal/test:__subpackages__", "//location/nearby/analytics/cpp:__subpackages__", "//location/nearby/cpp/sharing:__subpackages__", - "//presence:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", + "//third_party/nearby/connections/implementation/analytics:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/crypto_cros:__pkg__", + "//third_party/nearby/internal/platform:__pkg__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/internal/preferences:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/presence:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//internal/crypto_cros", - "//internal/platform:base", - "//internal/platform/implementation/shared:crypto", # Non-chromium impl - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:core_headers", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation/shared:crypto", # Non-chromium impl "@nlohmann_json//:json", ], ) @@ -144,8 +144,8 @@ cc_library( "//:__subpackages__", ], deps = [ - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", ], ) @@ -168,28 +168,28 @@ cc_library( ], copts = ["-DNO_WEBRTC"], visibility = [ - "//connections/implementation:__subpackages__", - "//fastpair/internal/mediums:__pkg__", - "//internal/network:__subpackages__", - "//internal/platform:__pkg__", - "//internal/platform/implementation:__subpackages__", - "//presence:__subpackages__", - "//presence/implementation:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", + "//third_party/nearby/fastpair/internal/mediums:__pkg__", + "//third_party/nearby/internal/network:__subpackages__", + "//third_party/nearby/internal/platform:__pkg__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", + "//third_party/nearby/presence:__subpackages__", + "//third_party/nearby/presence/implementation:__subpackages__", ], deps = [ - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:uuid", - "//internal/proto:credential_cc_proto", - "//internal/proto:local_credential_cc_proto", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:local_credential_cc_proto", # TODO: Support WebRTC - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", ], ) @@ -200,21 +200,21 @@ cc_library( ], defines = ["NO_WEBRTC"], visibility = [ - "//connections/implementation:__subpackages__", - "//internal:__subpackages__", - "//internal/network:__subpackages__", - "//internal/platform:__pkg__", - "//internal/platform/implementation:__subpackages__", "//location/nearby/analytics/cpp:__subpackages__", "//location/nearby/apps/better_together/plugins/preferences_native:__subpackages__", "//location/nearby/cpp/sharing:__subpackages__", + "//third_party/nearby/connections/implementation:__subpackages__", + "//third_party/nearby/internal:__subpackages__", + "//third_party/nearby/internal/network:__subpackages__", + "//third_party/nearby/internal/platform:__pkg__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", ], deps = [ ":comm", ":types", - "//internal/platform:base", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", ], ) @@ -226,8 +226,8 @@ cc_test( shard_count = 8, deps = [ ":wifi_utils", + "//third_party/absl/strings", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/platform/implementation/apple/BUILD b/internal/platform/implementation/apple/BUILD index 14912f31d6..79ecad90eb 100644 --- a/internal/platform/implementation/apple/BUILD +++ b/internal/platform/implementation/apple/BUILD @@ -14,10 +14,10 @@ licenses(["notice"]) package(default_visibility = [ - "//connections:__subpackages__", - "//internal/platform/implementation/apple:__subpackages__", "//location/nearby:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/internal/platform/implementation/apple:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ]) objc_library( @@ -50,22 +50,22 @@ objc_library( ":ble_v2", # Required Reason API File: third_party/nearby/internal/platform/implementation/apple/preferences_manager.mm "//releasetools/apple/privacy/privacymanifests/requiredreasonsapi:user_defaults-user_defaults-read_write_app_data_ca92_1", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:Foundation", "//third_party/apple_frameworks:Network", "@nlohmann_json//:json", - "//internal/platform:base", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "//internal/platform/implementation/apple/Mediums", - "//internal/platform/implementation/shared:file", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/apple/Mediums", + "//third_party/nearby/internal/platform/implementation/shared:file", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ] + select({ "@platforms//os:platform_ios": [ @@ -103,19 +103,19 @@ objc_library( # Prevent Objective-C++ headers from being pulled into swift. aspect_hints = ["//tools/build_defs/swift:no_module"], deps = [ - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation/apple/Mediums", - "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Central", - "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Peripheral", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:Foundation", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation/apple/Mediums", + "//third_party/nearby/internal/platform/implementation/apple/Mediums/Ble/Sockets:Central", + "//third_party/nearby/internal/platform/implementation/apple/Mediums/Ble/Sockets:Peripheral", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", ], ) @@ -148,13 +148,13 @@ cc_library( "mutex.h", ], deps = [ - "//internal/platform:base", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -170,11 +170,11 @@ cc_test( shard_count = 16, deps = [ ":Platform_cc", - "//internal/platform/implementation/g3:crypto", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3:crypto", + "//thread/fiber", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", - "@com_google_nisaba//nisaba/port:thread_pool/fiber", ], ) diff --git a/internal/platform/implementation/apple/Mediums/BUILD b/internal/platform/implementation/apple/Mediums/BUILD index 21f1c10d4f..9a5ea1467b 100644 --- a/internal/platform/implementation/apple/Mediums/BUILD +++ b/internal/platform/implementation/apple/Mediums/BUILD @@ -13,7 +13,7 @@ # limitations under the License. licenses(["notice"]) -package(default_visibility = ["//internal/platform/implementation/apple:__subpackages__"]) +package(default_visibility = ["//third_party/nearby/internal/platform/implementation/apple:__subpackages__"]) objc_library( name = "Mediums", @@ -59,13 +59,13 @@ objc_library( "WiFiLAN/GNCWiFiLANSocket.h", ], deps = [ - "//internal/platform/implementation/apple:Shared", - "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Shared", - "//proto/mediums:ble_frames_cc_proto", "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:Foundation", "//third_party/apple_frameworks:Network", "//third_party/apple_frameworks:ObjectiveC", + "//third_party/nearby/internal/platform/implementation/apple:Shared", + "//third_party/nearby/internal/platform/implementation/apple/Mediums/Ble/Sockets:Shared", + "//third_party/nearby/proto/mediums:ble_frames_cc_proto", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ], ) diff --git a/internal/platform/implementation/apple/Tests/BUILD b/internal/platform/implementation/apple/Tests/BUILD index c11daf7319..edc9b5633a 100644 --- a/internal/platform/implementation/apple/Tests/BUILD +++ b/internal/platform/implementation/apple/Tests/BUILD @@ -47,17 +47,17 @@ objc_library( "NSData+GNCWebSafeBase64Test.m", ], deps = [ - "//internal/platform:base", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "//internal/platform/implementation/apple", # buildcleaner: keep - "//internal/platform/implementation/apple:ble_v2", - "//internal/platform/implementation/apple/Mediums", + "//third_party/absl/time", "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:Foundation", "//third_party/apple_frameworks:XCTest", - "@com_google_absl//absl/time", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/apple", # buildcleaner: keep + "//third_party/nearby/internal/platform/implementation/apple:ble_v2", + "//third_party/nearby/internal/platform/implementation/apple/Mediums", ], ) diff --git a/internal/platform/implementation/g3/BUILD b/internal/platform/implementation/g3/BUILD index ed9b94b567..d0880dc703 100644 --- a/internal/platform/implementation/g3/BUILD +++ b/internal/platform/implementation/g3/BUILD @@ -36,22 +36,22 @@ cc_library( visibility = ["//visibility:private"], deps = [ ":preferences_repository", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:types", - "//internal/platform/implementation/shared:count_down_latch", - "//internal/platform/implementation/shared:posix_mutex", - "//internal/test", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:log_streamer", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:btree", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/log:log_streamer", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/shared:count_down_latch", + "//third_party/nearby/internal/platform/implementation/shared:posix_mutex", + "//third_party/nearby/internal/test", "@com_google_nisaba//nisaba/port:thread_pool", "@nlohmann_json//:json", ], @@ -86,27 +86,27 @@ cc_library( visibility = ["//visibility:private"], deps = [ ":types", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation/shared:count_down_latch", - "//internal/proto:credential_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/log:check", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation/shared:count_down_latch", + "//third_party/nearby/internal/proto:credential_cc_proto", # TODO: Support WebRTC "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", ], ) @@ -116,12 +116,12 @@ cc_library( srcs = [ "crypto.cc", ], - visibility = ["//internal/platform/implementation:__subpackages__"], + visibility = ["//third_party/nearby/internal/platform/implementation:__subpackages__"], deps = [ - "//internal/platform:base", - "//internal/platform/implementation:types", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation:types", "@boringssl//:crypto", - "@com_google_absl//absl/strings", ], alwayslink = 1, ) @@ -134,41 +134,41 @@ cc_library( ], defines = ["NO_WEBRTC"], visibility = [ - "//connections:__subpackages__", - "//connections:partners", - "//fastpair:__subpackages__", - "//internal/account:__subpackages__", - "//internal/auth:__subpackages__", - "//internal/crypto:__subpackages__", - "//internal/data:__subpackages__", - "//internal/network:__subpackages__", - "//internal/platform:__subpackages__", - "//internal/preferences:__subpackages__", - "//internal/proto/analytics:__subpackages__", - "//internal/test:__subpackages__", - "//internal/weave:__subpackages__", "//location/nearby/cpp:__subpackages__", "//location/nearby/sharing/sdk:__subpackages__", - "//presence:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/connections:partners", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/account:__subpackages__", + "//third_party/nearby/internal/auth:__subpackages__", + "//third_party/nearby/internal/crypto:__subpackages__", + "//third_party/nearby/internal/data:__subpackages__", + "//third_party/nearby/internal/network:__subpackages__", + "//third_party/nearby/internal/platform:__subpackages__", + "//third_party/nearby/internal/preferences:__subpackages__", + "//third_party/nearby/internal/proto/analytics:__subpackages__", + "//third_party/nearby/internal/test:__subpackages__", + "//third_party/nearby/internal/weave:__subpackages__", + "//third_party/nearby/presence:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":comm", ":crypto", # build_cleaner: keep ":types", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "//internal/platform/implementation/shared:count_down_latch", - "//internal/platform/implementation/shared:file", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/memory", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/shared:count_down_latch", + "//third_party/nearby/internal/platform/implementation/shared:file", "@com_google_nisaba//nisaba/port:thread_pool", ], ) @@ -178,9 +178,9 @@ cc_library( srcs = ["preferences_repository.cc"], hdrs = ["preferences_repository.h"], deps = [ - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", + "//third_party/absl/base:core_headers", + "//third_party/absl/strings", + "//third_party/absl/synchronization", "@nlohmann_json//:json", ], ) diff --git a/internal/platform/implementation/shared/BUILD b/internal/platform/implementation/shared/BUILD index b66deb11ec..5e4b1dc433 100644 --- a/internal/platform/implementation/shared/BUILD +++ b/internal/platform/implementation/shared/BUILD @@ -18,10 +18,10 @@ cc_library( srcs = [ "crypto.cc", ], - visibility = ["//internal/platform/implementation:__subpackages__"], + visibility = ["//third_party/nearby/internal/platform/implementation:__subpackages__"], deps = [ + "//third_party/absl/types:span", "@boringssl//:crypto", - "@com_google_absl//absl/types:span", ], ) @@ -34,9 +34,9 @@ cc_library( "posix_mutex.h", ], visibility = [ - "//internal/platform/implementation:__subpackages__", + "//third_party/nearby/internal/platform/implementation:__subpackages__", ], - deps = ["//internal/platform/implementation:types"], + deps = ["//third_party/nearby/internal/platform/implementation:types"], ) cc_library( @@ -49,7 +49,7 @@ cc_library( ], deps = [ ":posix_mutex", - "//internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -57,12 +57,12 @@ cc_library( name = "file", srcs = ["file.cc"], hdrs = ["file.h"], - visibility = ["//internal/platform/implementation:__subpackages__"], + visibility = ["//third_party/nearby/internal/platform/implementation:__subpackages__"], deps = [ - "//internal/platform:base", - "//internal/platform/implementation:types", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", + "//third_party/absl/memory", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -70,13 +70,13 @@ cc_library( name = "count_down_latch", srcs = ["count_down_latch.cc"], hdrs = ["count_down_latch.h"], - visibility = ["//internal/platform/implementation:__subpackages__"], + visibility = ["//third_party/nearby/internal/platform/implementation:__subpackages__"], deps = [ - "//internal/platform/implementation:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -86,9 +86,9 @@ cc_test( deps = [ ":file", "//file/util:temp_path", - "//internal/platform:base", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/platform/implementation/wifi_utils_test.cc b/internal/platform/implementation/wifi_utils_test.cc index f87a22a59b..c58d2ca390 100644 --- a/internal/platform/implementation/wifi_utils_test.cc +++ b/internal/platform/implementation/wifi_utils_test.cc @@ -15,7 +15,6 @@ #include "internal/platform/implementation/wifi_utils.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" diff --git a/internal/platform/implementation/windows/BUILD b/internal/platform/implementation/windows/BUILD index b3252fd7a1..d6506ffec0 100644 --- a/internal/platform/implementation/windows/BUILD +++ b/internal/platform/implementation/windows/BUILD @@ -42,27 +42,27 @@ cc_library( ], defines = ["_SILENCE_CLANG_COROUTINE_MESSAGE"], visibility = [ - "//sharing/internal/impl/windows:__pkg__", + "//third_party/nearby/sharing/internal/impl/windows:__pkg__", ], deps = [ ":comm", - "//internal/base:bluetooth_address", - "//internal/base:files", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:logging", - "//internal/platform:uuid", - "//internal/platform/implementation:types", - "//internal/platform/implementation/windows:string_utils", - "//internal/platform/implementation/windows/generated:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/memory", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/base:files", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:logging", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/windows:string_utils", + "//third_party/nearby/internal/platform/implementation/windows/generated:types", "@nlohmann_json//:json", ], ) @@ -109,27 +109,27 @@ cc_library( copts = ["-DNO_INTEL_PIE"], visibility = ["//visibility:private"], deps = [ - "//connections/implementation/flags:connections_flags", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:uuid", - "//internal/platform/flags:platform_flags", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:wifi_utils", - "//internal/platform/implementation/shared:count_down_latch", - "//internal/platform/implementation/windows/generated:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/memory", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/flags:platform_flags", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:wifi_utils", + "//third_party/nearby/internal/platform/implementation/shared:count_down_latch", + "//third_party/nearby/internal/platform/implementation/windows/generated:types", ], ) @@ -140,10 +140,10 @@ cc_library( ], visibility = ["//visibility:private"], deps = [ - "//internal/platform:base", - "//internal/platform/implementation:types", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform/implementation:types", "@boringssl//:crypto", - "@com_google_absl//absl/strings", ], ) @@ -156,13 +156,13 @@ cc_library( "string_utils.h", ], visibility = [ - "//internal/platform:__subpackages__", "//location/nearby:__subpackages__", + "//third_party/nearby/internal/platform:__subpackages__", ], deps = [ - "//internal/platform:logging", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/nearby/internal/platform:logging", ], ) @@ -223,48 +223,48 @@ cc_library( defines = ["_SILENCE_CLANG_COROUTINE_MESSAGE"], visibility = [ "//chrome/chromeos/assistant/data_migration/lib:__pkg__", - "//connections:__subpackages__", - "//connections:partners", - "//fastpair:__subpackages__", - "//internal/platform:__subpackages__", "//location/nearby:__subpackages__", - "//presence:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/connections:partners", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal/platform:__subpackages__", + "//third_party/nearby/presence:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":comm", ":crypto", # build_cleaner: keep ":string_utils", ":types", - "//connections/implementation/flags:connections_flags", - "//internal/account", - "//internal/base:files", - "//internal/flags:nearby_flags", - "//internal/platform:base", - "//internal/platform:cancellation_flag", - "//internal/platform:logging", - "//internal/platform:uuid", - "//internal/platform/flags:platform_flags", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "//internal/platform/implementation:wifi_utils", - "//internal/platform/implementation/shared:count_down_latch", - "//internal/platform/implementation/shared:file", - "//internal/platform/implementation/windows/generated:types", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/memory", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/nearby/connections/implementation/flags:connections_flags", + "//third_party/nearby/internal/account", + "//third_party/nearby/internal/base:files", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:cancellation_flag", + "//third_party/nearby/internal/platform:logging", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/flags:platform_flags", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation:wifi_utils", + "//third_party/nearby/internal/platform/implementation/shared:count_down_latch", + "//third_party/nearby/internal/platform/implementation/shared:file", + "//third_party/nearby/internal/platform/implementation/windows/generated:types", "//third_party/webrtc/files/stable/webrtc/api/task_queue:default_task_queue_factory", "//third_party/webrtc/files/stable/webrtc/rtc_base:checks", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", "@nlohmann_json//:json", ], ) @@ -280,7 +280,7 @@ cc_library( ], visibility = ["//visibility:private"], deps = [ - "//internal/platform:base", + "//third_party/nearby/internal/platform:base", "@nlohmann_json//:json", ], ) @@ -323,19 +323,19 @@ cc_test( ":test_utils", ":types", ":windows", - "//internal/platform:base", - "//internal/platform:logging", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "//internal/platform/implementation/shared:count_down_latch", - "//internal/platform/implementation/windows/generated:types", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:logging", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:platform", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/shared:count_down_latch", + "//third_party/nearby/internal/platform/implementation/windows/generated:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", "@nlohmann_json//:json", ], diff --git a/internal/platform/implementation/windows/ble_medium_test.cc b/internal/platform/implementation/windows/ble_medium_test.cc index bf63619a8f..25179e5372 100644 --- a/internal/platform/implementation/windows/ble_medium_test.cc +++ b/internal/platform/implementation/windows/ble_medium_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/synchronization/notification.h" #include "internal/platform/implementation/ble.h" diff --git a/internal/platform/implementation/windows/generated/BUILD b/internal/platform/implementation/windows/generated/BUILD index 17f33234a5..cbd9a0a7b1 100644 --- a/internal/platform/implementation/windows/generated/BUILD +++ b/internal/platform/implementation/windows/generated/BUILD @@ -42,10 +42,10 @@ cc_library( "shlwapi.lib", ], visibility = [ - "//fastpair:__subpackages__", - "//internal:__subpackages__", - "//internal/platform/implementation/windows:__subpackages__", "//location/nearby/apps/better_together/plugins:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/fastpair:__subpackages__", + "//third_party/nearby/internal:__subpackages__", + "//third_party/nearby/internal/platform/implementation/windows:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], ) diff --git a/internal/platform/input_stream_test.cc b/internal/platform/input_stream_test.cc index 53d9d4c029..1e6533b723 100644 --- a/internal/platform/input_stream_test.cc +++ b/internal/platform/input_stream_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/byte_array.h" #include "internal/platform/exception.h" diff --git a/internal/platform/uuid_test.cc b/internal/platform/uuid_test.cc index 136ef90ee6..dd51a0eb36 100644 --- a/internal/platform/uuid_test.cc +++ b/internal/platform/uuid_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "internal/platform/crypto.h" diff --git a/internal/platform/wifi_hotspot_test.cc b/internal/platform/wifi_hotspot_test.cc index 262f30984f..6e9d2104db 100644 --- a/internal/platform/wifi_hotspot_test.cc +++ b/internal/platform/wifi_hotspot_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/clock.h" #include "internal/platform/byte_array.h" diff --git a/internal/platform/wifi_lan_connection_info_test.cc b/internal/platform/wifi_lan_connection_info_test.cc index 3e5473c610..e2d2713866 100644 --- a/internal/platform/wifi_lan_connection_info_test.cc +++ b/internal/platform/wifi_lan_connection_info_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" diff --git a/internal/platform/wifi_lan_test.cc b/internal/platform/wifi_lan_test.cc index 430ee910a5..6a3e900fbd 100644 --- a/internal/platform/wifi_lan_test.cc +++ b/internal/platform/wifi_lan_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "internal/platform/count_down_latch.h" diff --git a/internal/platform/wifi_test.cc b/internal/platform/wifi_test.cc index c7cbe78b8f..09628f6a21 100644 --- a/internal/platform/wifi_test.cc +++ b/internal/platform/wifi_test.cc @@ -15,7 +15,6 @@ #include "internal/platform/wifi.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/internal/proto/analytics/BUILD b/internal/proto/analytics/BUILD index e002a9d253..706d747dd9 100644 --- a/internal/proto/analytics/BUILD +++ b/internal/proto/analytics/BUILD @@ -27,15 +27,15 @@ proto_library( "connections_log.proto", ], deps = [ - "//proto:connections_enums_proto", - "//proto/errorcode:error_code_enums_proto", + "//third_party/nearby/proto:connections_enums_proto", + "//third_party/nearby/proto/errorcode:error_code_enums_proto", ], ) proto_library( name = "fast_pair_log_proto", srcs = ["fast_pair_log.proto"], - deps = ["//proto:fast_pair_enums_proto"], + deps = ["//third_party/nearby/proto:fast_pair_enums_proto"], ) cc_proto_library( @@ -51,9 +51,9 @@ java_proto_library( cc_proto_library( name = "connections_log_cc_proto", visibility = [ - "//connections:__subpackages__", - "//internal/analytics:__pkg__", "//location/nearby/analytics/cpp:__subpackages__", + "//third_party/nearby/connections:__subpackages__", + "//third_party/nearby/internal/analytics:__pkg__", ], deps = [":connections_log_proto"], ) @@ -67,9 +67,9 @@ cc_test( shard_count = 16, deps = [ ":connections_log_cc_proto", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep - "//proto:connections_enums_cc_proto", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/proto:connections_enums_cc_proto", "//third_party/protobuf", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", diff --git a/internal/test/BUILD b/internal/test/BUILD index 97ae5eb4dc..1dcc868689 100644 --- a/internal/test/BUILD +++ b/internal/test/BUILD @@ -23,11 +23,11 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:signin_attempt", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings:string_view", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/strings:string_view", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:signin_attempt", "@com_google_googletest//:gtest_for_library_testonly", ], ) @@ -56,22 +56,22 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/base", - "//internal/network:types", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:signin_attempt", - "//internal/platform/implementation:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", # fixdeps: keep + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", # fixdeps: keep + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:signin_attempt", + "//third_party/nearby/internal/platform/implementation:types", ], ) @@ -92,18 +92,18 @@ cc_test( shard_count = 8, deps = [ ":test", - "//internal/network:types", - "//internal/network:url", - "//internal/platform:types", - "//internal/platform/implementation:types", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/test/fake_clock_test.cc b/internal/test/fake_clock_test.cc index 0f57ce564c..be446c0fcc 100644 --- a/internal/test/fake_clock_test.cc +++ b/internal/test/fake_clock_test.cc @@ -15,7 +15,6 @@ #include "internal/test/fake_clock.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/internal/test/fake_http_client_test.cc b/internal/test/fake_http_client_test.cc index 2c498b52ef..f0deea41b2 100644 --- a/internal/test/fake_http_client_test.cc +++ b/internal/test/fake_http_client_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" diff --git a/internal/weave/BUILD b/internal/weave/BUILD index 62bda5fae6..2cccd48ce9 100644 --- a/internal/weave/BUILD +++ b/internal/weave/BUILD @@ -35,15 +35,15 @@ cc_library( ":__subpackages__", ], deps = [ - "//internal/platform:base", - "//internal/platform:types", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/base:core_headers", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/log:check", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", ], ) @@ -54,10 +54,10 @@ cc_test( ], deps = [ ":weave", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/absl/strings:str_format", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings:str_format", "@com_google_googletest//:gtest_main", ], ) @@ -69,7 +69,7 @@ cc_test( ], deps = [ ":weave", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -82,9 +82,9 @@ cc_test( ], deps = [ ":weave", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ], ) @@ -96,9 +96,9 @@ cc_test( ], deps = [ ":weave", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ], ) @@ -110,11 +110,11 @@ cc_test( ], deps = [ ":weave", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -126,13 +126,13 @@ cc_test( ], deps = [ ":weave", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/base:core_headers", + "//third_party/absl/status", + "//third_party/absl/synchronization", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/synchronization", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/weave/base_socket_test.cc b/internal/weave/base_socket_test.cc index b683df761c..32dfccf00e 100644 --- a/internal/weave/base_socket_test.cc +++ b/internal/weave/base_socket_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/base/thread_annotations.h" #include "absl/status/status.h" diff --git a/internal/weave/control_packet_write_request_test.cc b/internal/weave/control_packet_write_request_test.cc index 50a1f72bcc..74026386be 100644 --- a/internal/weave/control_packet_write_request_test.cc +++ b/internal/weave/control_packet_write_request_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "internal/weave/packet.h" diff --git a/internal/weave/message_write_request_test.cc b/internal/weave/message_write_request_test.cc index fac47d0b7e..0f59d50522 100644 --- a/internal/weave/message_write_request_test.cc +++ b/internal/weave/message_write_request_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" diff --git a/internal/weave/packet_sequence_number_generator_test.cc b/internal/weave/packet_sequence_number_generator_test.cc index ce8d924644..3bf1b9133e 100644 --- a/internal/weave/packet_sequence_number_generator_test.cc +++ b/internal/weave/packet_sequence_number_generator_test.cc @@ -15,7 +15,6 @@ #include "internal/weave/packet_sequence_number_generator.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/internal/weave/packet_test.cc b/internal/weave/packet_test.cc index 8fc7385be2..b297ec807a 100644 --- a/internal/weave/packet_test.cc +++ b/internal/weave/packet_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" diff --git a/internal/weave/packetizer_test.cc b/internal/weave/packetizer_test.cc index 6518e958e2..fe798e666e 100644 --- a/internal/weave/packetizer_test.cc +++ b/internal/weave/packetizer_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "internal/weave/packet.h" diff --git a/internal/weave/sockets/BUILD b/internal/weave/sockets/BUILD index 5b7d14c92d..e8f8be2f2b 100644 --- a/internal/weave/sockets/BUILD +++ b/internal/weave/sockets/BUILD @@ -25,13 +25,13 @@ cc_library( ], visibility = ["//visibility:private"], deps = [ - "//internal/platform:types", - "//internal/weave", - "@com_google_absl//absl/log", - "@com_google_absl//absl/random", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/log", + "//third_party/absl/random", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/weave", ], ) @@ -43,12 +43,12 @@ cc_test( ], deps = [ ":sockets", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation/g3", # build_cleaner: keep + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/internal/weave/sockets/client_socket_test.cc b/internal/weave/sockets/client_socket_test.cc index bf20509ec3..d322100713 100644 --- a/internal/weave/sockets/client_socket_test.cc +++ b/internal/weave/sockets/client_socket_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" diff --git a/internal/weave/sockets/server_socket_test.cc b/internal/weave/sockets/server_socket_test.cc index dde3168555..8fca45833e 100644 --- a/internal/weave/sockets/server_socket_test.cc +++ b/internal/weave/sockets/server_socket_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/synchronization/mutex.h" diff --git a/presence/BUILD b/presence/BUILD index 81458bb8e3..794405d803 100644 --- a/presence/BUILD +++ b/presence/BUILD @@ -31,23 +31,23 @@ cc_library( ], deps = [ ":types", - "//internal/interop:authentication_status", - "//internal/interop:authentication_transport_interface", - "//internal/interop:device", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//internal/proto:local_credential_cc_proto", - "//internal/proto:metadata_cc_proto", - "//presence/implementation:internal", # build_cleaner: keep - "//presence/implementation/mediums", - "//presence/proto:presence_frame_cc_proto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:variant", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/internal/interop:authentication_transport_interface", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:local_credential_cc_proto", + "//third_party/nearby/internal/proto:metadata_cc_proto", + "//third_party/nearby/presence/implementation:internal", # build_cleaner: keep + "//third_party/nearby/presence/implementation/mediums", + "//third_party/nearby/presence/proto:presence_frame_cc_proto", ], ) @@ -65,12 +65,12 @@ cc_library( deps = [ ":presence", ":types", - "//internal/interop:device", - "//internal/interop:test_support", - "//internal/platform:types", - "//internal/proto:metadata_cc_proto", - "//presence/implementation:internal", # build_cleaner: keep - "@com_google_absl//absl/status:statusor", + "//third_party/absl/status:statusor", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/interop:test_support", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/proto:metadata_cc_proto", + "//third_party/nearby/presence/implementation:internal", # build_cleaner: keep ], ) @@ -100,19 +100,19 @@ cc_library( "scan_request_builder.h", ], deps = [ - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/interop:device", - "//internal/platform:base", - "//internal/platform:connection_info", - "//internal/platform:types", - "//internal/platform/implementation:types", - "//internal/proto:credential_cc_proto", - "//internal/proto:metadata_cc_proto", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/absl/types:variant", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:connection_info", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:metadata_cc_proto", ], ) @@ -133,21 +133,21 @@ cc_test( shard_count = 6, deps = [ ":types", - "//connections/implementation/proto:offline_wire_formats_cc_proto", - "//internal/platform:connection_info", - "//internal/platform:types", - "//internal/proto:credential_cc_proto", - "//internal/proto:metadata_cc_proto", + "//third_party/absl/strings", + "//third_party/absl/types:variant", + "//third_party/nearby/connections/implementation/proto:offline_wire_formats_cc_proto", + "//third_party/nearby/internal/platform:connection_info", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:metadata_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -161,17 +161,17 @@ cc_test( ], shard_count = 6, deps = [ - "//internal/platform:uuid", - "//internal/proto:credential_cc_proto", - "//internal/proto:local_credential_cc_proto", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:local_credential_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -188,32 +188,32 @@ cc_test( deps = [ ":presence", ":types", - "//internal/crypto", - "//internal/interop:authentication_status", - "//internal/interop:authentication_transport_interface", - "//internal/interop:device", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//internal/proto:credential_cc_proto", - "//internal/proto:local_credential_cc_proto", - "//internal/proto:metadata_cc_proto", - "//presence/implementation:internal", - "//presence/implementation:internal_test", - "//presence/proto:presence_frame_cc_proto", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/crypto", + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/internal/interop:authentication_transport_interface", + "//third_party/nearby/internal/interop:device", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:local_credential_cc_proto", + "//third_party/nearby/internal/proto:metadata_cc_proto", + "//third_party/nearby/presence/implementation:internal", + "//third_party/nearby/presence/implementation:internal_test", + "//third_party/nearby/presence/proto:presence_frame_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) diff --git a/presence/broadcast_options_test.cc b/presence/broadcast_options_test.cc index e2e5c38164..aadf4e5d28 100644 --- a/presence/broadcast_options_test.cc +++ b/presence/broadcast_options_test.cc @@ -15,7 +15,6 @@ #include "presence/broadcast_options.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/presence/credential_test.cc b/presence/credential_test.cc index cfaa00d023..c076c226b2 100644 --- a/presence/credential_test.cc +++ b/presence/credential_test.cc @@ -16,7 +16,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/uuid.h" #include "internal/proto/credential.pb.h" diff --git a/presence/device_motion_test.cc b/presence/device_motion_test.cc index 1155903aa0..75c438dc93 100644 --- a/presence/device_motion_test.cc +++ b/presence/device_motion_test.cc @@ -15,7 +15,6 @@ #include "presence/device_motion.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/presence/discovery_filter_test.cc b/presence/discovery_filter_test.cc index c85f8f83dd..a50d4317d6 100644 --- a/presence/discovery_filter_test.cc +++ b/presence/discovery_filter_test.cc @@ -15,7 +15,6 @@ #include "presence/discovery_filter.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/presence/discovery_options_test.cc b/presence/discovery_options_test.cc index 631ed12f65..8c0a61759e 100644 --- a/presence/discovery_options_test.cc +++ b/presence/discovery_options_test.cc @@ -15,7 +15,6 @@ #include "presence/discovery_options.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/presence/fpp/BUILD b/presence/fpp/BUILD index 931c75a25e..fe0f8c08cd 100644 --- a/presence/fpp/BUILD +++ b/presence/fpp/BUILD @@ -21,15 +21,15 @@ cc_library( ], hdrs = ["fpp_manager.h"], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ - "//internal/platform:types", - "//presence:types", - "//presence/fpp/fpp_c_ffi", - "//presence/implementation:sensor_fusion", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/presence:types", + "//third_party/nearby/presence/fpp/fpp_c_ffi", + "//third_party/nearby/presence/implementation:sensor_fusion", ], ) @@ -40,12 +40,12 @@ cc_library( ], hdrs = ["sensor_fusion_impl.h"], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":fpp_manager", - "//presence/implementation:sensor_fusion", - "@com_google_absl//absl/status", + "//third_party/absl/status", + "//third_party/nearby/presence/implementation:sensor_fusion", ], ) @@ -55,16 +55,16 @@ cc_test( srcs = ["fpp_manager_test.cc"], deps = [ ":fpp_manager", - "//presence/implementation:sensor_fusion", + "//third_party/absl/status", + "//third_party/nearby/presence/implementation:sensor_fusion", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -75,16 +75,16 @@ cc_test( srcs = ["sensor_fusion_test.cc"], deps = [ ":sensor_fusion_impl", - "//presence/implementation:sensor_fusion", + "//third_party/absl/status", + "//third_party/nearby/presence/implementation:sensor_fusion", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) diff --git a/presence/fpp/fpp_manager_test.cc b/presence/fpp/fpp_manager_test.cc index 6911e06fdb..1081e0eeb0 100644 --- a/presence/fpp/fpp_manager_test.cc +++ b/presence/fpp/fpp_manager_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "presence/implementation/sensor_fusion.h" diff --git a/presence/fpp/sensor_fusion_test.cc b/presence/fpp/sensor_fusion_test.cc index aee34d7b19..0ce9ac9055 100644 --- a/presence/fpp/sensor_fusion_test.cc +++ b/presence/fpp/sensor_fusion_test.cc @@ -16,7 +16,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "presence/fpp/sensor_fusion_impl.h" diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD index 40cd72389d..0a18142735 100644 --- a/presence/implementation/BUILD +++ b/presence/implementation/BUILD @@ -63,42 +63,42 @@ cc_library( ], defines = ["USE_RUST_DECODER=1"], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ - "//internal/crypto", - "//internal/crypto_cros", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//internal/proto:credential_cc_proto", - "//internal/proto:local_credential_cc_proto", - "//internal/proto:metadata_cc_proto", - "//presence:types", - "//presence/implementation/mediums", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/hash", + "//third_party/absl/log:check", + "//third_party/absl/log:die_if_null", + "//third_party/absl/random", + "//third_party/absl/random:distributions", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/absl/types:span", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/crypto", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:local_credential_cc_proto", + "//third_party/nearby/internal/proto:metadata_cc_proto", + "//third_party/nearby/presence:types", + "//third_party/nearby/presence/implementation/mediums", "@beto-core//:ldt_np_adv_ffi", "@beto-core//:np_c_ffi_types", "@beto-core//:np_cpp_ffi", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/log:die_if_null", - "@com_google_absl//absl/random", - "@com_google_absl//absl/random:distributions", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", ], ) @@ -113,41 +113,41 @@ cc_library( ":presence_internal_common_hdrs", ], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ "//devtools/rust:rust_okay_here", - "//internal/crypto", - "//internal/crypto_cros", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:types", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//internal/proto:credential_cc_proto", - "//internal/proto:local_credential_cc_proto", - "//internal/proto:metadata_cc_proto", - "//presence:types", - "//presence/implementation/mediums", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/hash", + "//third_party/absl/log:check", + "//third_party/absl/log:die_if_null", + "//third_party/absl/random", + "//third_party/absl/random:distributions", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/absl/types:span", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/crypto", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:local_credential_cc_proto", + "//third_party/nearby/internal/proto:metadata_cc_proto", + "//third_party/nearby/presence:types", + "//third_party/nearby/presence/implementation/mediums", "@beto-core//:ldt_np_adv_ffi", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/log:die_if_null", - "@com_google_absl//absl/random", - "@com_google_absl//absl/random:distributions", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", ], ) @@ -155,12 +155,12 @@ cc_library( name = "sensor_fusion", hdrs = ["sensor_fusion.h"], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ - "//presence:types", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/nearby/presence:types", ], ) @@ -175,17 +175,17 @@ cc_library( "mock_service_controller.h", ], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ ":internal", - "//internal/platform/implementation:comm", - "//internal/proto:credential_cc_proto", - "//internal/proto:local_credential_cc_proto", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings:string_view", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:local_credential_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings:string_view", "@com_google_googletest//:gtest_main", ], ) @@ -196,21 +196,21 @@ cc_test( srcs = ["advertisement_decoder_test.cc"], deps = [ ":internal_deprecated", - "//internal/platform:base", - "//internal/proto:credential_cc_proto", - "//presence:types", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -221,21 +221,21 @@ cc_test( srcs = ["advertisement_decoder_new_format_test.cc"], deps = [ ":internal", - "//internal/platform:base", - "//internal/proto:credential_cc_proto", - "//presence:types", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -246,18 +246,18 @@ cc_test( srcs = ["advertisement_filter_test.cc"], deps = [ ":internal", - "//internal/platform:base", - "//internal/proto:credential_cc_proto", - "//presence:types", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -268,20 +268,20 @@ cc_test( srcs = ["advertisement_factory_test.cc"], deps = [ ":internal", - "//internal/platform:base", - "//internal/proto:credential_cc_proto", - "//presence:types", - "//presence/implementation/mediums", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence:types", + "//third_party/nearby/presence/implementation/mediums", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -292,19 +292,19 @@ cc_test( srcs = ["broadcast_manager_test.cc"], deps = [ ":internal", - "//internal/platform:base", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/proto:credential_cc_proto", - "//presence/implementation/mediums", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence/implementation/mediums", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -315,17 +315,17 @@ cc_test( srcs = ["ldt_test.cc"], deps = [ ":internal", - "//internal/platform:base", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/platform:base", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -335,17 +335,17 @@ cc_test( srcs = ["base_broadcast_request_test.cc"], deps = [ ":internal", - "//internal/proto:credential_cc_proto", - "//presence:types", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -356,16 +356,16 @@ cc_test( srcs = ["action_factory_test.cc"], deps = [ ":internal", - "//presence:types", + "//third_party/absl/strings", + "//third_party/nearby/presence:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -376,19 +376,19 @@ cc_test( srcs = ["connection_authenticator_impl_test.cc"], deps = [ ":internal", - "//internal/crypto", - "//internal/crypto_cros", - "//internal/proto:credential_cc_proto", - "//internal/proto:local_credential_cc_proto", - "//presence/proto:presence_frame_cc_proto", + "//third_party/nearby/internal/crypto", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/internal/proto:local_credential_cc_proto", + "//third_party/nearby/presence/proto:presence_frame_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -399,25 +399,25 @@ cc_test( srcs = ["credential_manager_impl_test.cc"], deps = [ ":internal", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//internal/proto:credential_cc_proto", "//net/proto2/contrib/parse_proto:testing", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:credential_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -429,26 +429,26 @@ cc_test( deps = [ ":internal", ":internal_test", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//internal/proto:credential_cc_proto", - "//presence:types", - "//presence/implementation/mediums", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/absl/types:variant", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence:types", + "//third_party/nearby/presence/implementation/mediums", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -460,26 +460,26 @@ cc_test( deps = [ ":internal", ":internal_test", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", - "//internal/proto:credential_cc_proto", "//net/proto2/contrib/parse_proto:testing", - "//presence/implementation/mediums", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/internal/proto:credential_cc_proto", + "//third_party/nearby/presence/implementation/mediums", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) diff --git a/presence/implementation/action_factory_test.cc b/presence/implementation/action_factory_test.cc index 63db199063..2fef768d71 100644 --- a/presence/implementation/action_factory_test.cc +++ b/presence/implementation/action_factory_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" #include "presence/data_element.h" diff --git a/presence/implementation/advertisement_decoder_new_format_test.cc b/presence/implementation/advertisement_decoder_new_format_test.cc index ef78c82893..24ebb8b2e6 100644 --- a/presence/implementation/advertisement_decoder_new_format_test.cc +++ b/presence/implementation/advertisement_decoder_new_format_test.cc @@ -16,7 +16,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" diff --git a/presence/implementation/advertisement_decoder_test.cc b/presence/implementation/advertisement_decoder_test.cc index 5b2a70d473..4e156e3a83 100644 --- a/presence/implementation/advertisement_decoder_test.cc +++ b/presence/implementation/advertisement_decoder_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" diff --git a/presence/implementation/advertisement_factory_test.cc b/presence/implementation/advertisement_factory_test.cc index 8c2897f892..4ab2aada44 100644 --- a/presence/implementation/advertisement_factory_test.cc +++ b/presence/implementation/advertisement_factory_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/escaping.h" diff --git a/presence/implementation/advertisement_filter_test.cc b/presence/implementation/advertisement_filter_test.cc index ff3a1dfd78..297cfba246 100644 --- a/presence/implementation/advertisement_filter_test.cc +++ b/presence/implementation/advertisement_filter_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" diff --git a/presence/implementation/base_broadcast_request_test.cc b/presence/implementation/base_broadcast_request_test.cc index b27040b370..a215ccd214 100644 --- a/presence/implementation/base_broadcast_request_test.cc +++ b/presence/implementation/base_broadcast_request_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/types/variant.h" #include "internal/proto/credential.pb.h" diff --git a/presence/implementation/broadcast_manager_test.cc b/presence/implementation/broadcast_manager_test.cc index 0e777768e3..a41f11db2e 100644 --- a/presence/implementation/broadcast_manager_test.cc +++ b/presence/implementation/broadcast_manager_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/count_down_latch.h" #include "internal/platform/feature_flags.h" diff --git a/presence/implementation/connection_authenticator_impl_test.cc b/presence/implementation/connection_authenticator_impl_test.cc index e28eb47727..c60dfa4e30 100644 --- a/presence/implementation/connection_authenticator_impl_test.cc +++ b/presence/implementation/connection_authenticator_impl_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/crypto/ed25519.h" #include "internal/proto/credential.pb.h" diff --git a/presence/implementation/credential_manager_impl_test.cc b/presence/implementation/credential_manager_impl_test.cc index 44d3765967..3db9cce17c 100644 --- a/presence/implementation/credential_manager_impl_test.cc +++ b/presence/implementation/credential_manager_impl_test.cc @@ -22,7 +22,6 @@ #include "net/proto2/contrib/parse_proto/testing.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/presence/implementation/ldt_test.cc b/presence/implementation/ldt_test.cc index b574cc7d41..2ebf1a48a0 100644 --- a/presence/implementation/ldt_test.cc +++ b/presence/implementation/ldt_test.cc @@ -16,7 +16,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/statusor.h" #include "absl/strings/escaping.h" diff --git a/presence/implementation/mediums/BUILD b/presence/implementation/mediums/BUILD index a2592bc74d..01872d6247 100644 --- a/presence/implementation/mediums/BUILD +++ b/presence/implementation/mediums/BUILD @@ -23,12 +23,12 @@ cc_library( "mediums.h", ], visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [ - "//internal/platform:comm", - "//internal/platform:uuid", - "//presence:types", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/presence:types", ], ) @@ -41,20 +41,20 @@ cc_test( shard_count = 16, deps = [ ":mediums", - "//internal/platform:comm", - "//internal/platform:test_util", - "//internal/platform:types", - "//internal/platform:uuid", - "//internal/platform/implementation:comm", - "//presence:types", + "//third_party/nearby/internal/platform:comm", + "//third_party/nearby/internal/platform:test_util", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform:uuid", + "//third_party/nearby/internal/platform/implementation:comm", + "//third_party/nearby/presence:types", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) diff --git a/presence/implementation/mediums/ble_test.cc b/presence/implementation/mediums/ble_test.cc index 92c95cddd5..329c4c29be 100644 --- a/presence/implementation/mediums/ble_test.cc +++ b/presence/implementation/mediums/ble_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/ble_v2.h" #include "internal/platform/bluetooth_adapter.h" diff --git a/presence/implementation/scan_manager_test.cc b/presence/implementation/scan_manager_test.cc index f58a7c8c10..6ff2defc20 100644 --- a/presence/implementation/scan_manager_test.cc +++ b/presence/implementation/scan_manager_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/escaping.h" #include "absl/types/variant.h" diff --git a/presence/implementation/service_controller_impl_test.cc b/presence/implementation/service_controller_impl_test.cc index 5d63818681..424f846e04 100644 --- a/presence/implementation/service_controller_impl_test.cc +++ b/presence/implementation/service_controller_impl_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" diff --git a/presence/presence_action_test.cc b/presence/presence_action_test.cc index 64b5e78e64..a8f7176d87 100644 --- a/presence/presence_action_test.cc +++ b/presence/presence_action_test.cc @@ -15,7 +15,6 @@ #include "presence/presence_action.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby { diff --git a/presence/presence_client_test.cc b/presence/presence_client_test.cc index 2c43f26f01..6acbce84b2 100644 --- a/presence/presence_client_test.cc +++ b/presence/presence_client_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/presence/presence_device_provider_test.cc b/presence/presence_device_provider_test.cc index a898527060..c41186aba1 100644 --- a/presence/presence_device_provider_test.cc +++ b/presence/presence_device_provider_test.cc @@ -21,7 +21,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" diff --git a/presence/presence_device_test.cc b/presence/presence_device_test.cc index e567d7495f..f91cd8d11d 100644 --- a/presence/presence_device_test.cc +++ b/presence/presence_device_test.cc @@ -18,7 +18,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/proto/offline_wire_formats.pb.h" #include "internal/platform/ble_connection_info.h" diff --git a/presence/presence_identity_test.cc b/presence/presence_identity_test.cc index 5b45704d5a..3b78e53c68 100644 --- a/presence/presence_identity_test.cc +++ b/presence/presence_identity_test.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/proto/credential.pb.h" diff --git a/presence/presence_service_test.cc b/presence/presence_service_test.cc index 1f24275bef..fdb1adea95 100644 --- a/presence/presence_service_test.cc +++ b/presence/presence_service_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "internal/platform/count_down_latch.h" diff --git a/presence/presence_zone_test.cc b/presence/presence_zone_test.cc index e813bf48bb..17d7822dc6 100644 --- a/presence/presence_zone_test.cc +++ b/presence/presence_zone_test.cc @@ -15,7 +15,6 @@ #include "presence/presence_zone.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "presence/device_motion.h" diff --git a/presence/proto/BUILD b/presence/proto/BUILD index 6351491c76..53c58590c1 100644 --- a/presence/proto/BUILD +++ b/presence/proto/BUILD @@ -23,7 +23,7 @@ proto_library( cc_proto_library( name = "presence_frame_cc_proto", visibility = [ - "//presence:__subpackages__", + "//third_party/nearby/presence:__subpackages__", ], deps = [":presence_frame_proto"], ) diff --git a/presence/scan_request_builder_test.cc b/presence/scan_request_builder_test.cc index 1d0fd6bed9..d8ff348b74 100644 --- a/presence/scan_request_builder_test.cc +++ b/presence/scan_request_builder_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "internal/proto/credential.pb.h" diff --git a/sharing/BUILD b/sharing/BUILD index ce0fb7a2c8..905f3f44aa 100644 --- a/sharing/BUILD +++ b/sharing/BUILD @@ -18,13 +18,13 @@ cc_library( name = "connection_types", hdrs = ["nearby_connections_types.h"], deps = [ - "//internal/base:files", - "//internal/crypto_cros", # buildcleaner: keep - "//internal/interop:authentication_status", - "//sharing/common:compatible_u8_string", - "@com_google_absl//absl/random", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", + "//third_party/absl/random", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/internal/base:files", + "//third_party/nearby/internal/crypto_cros", # buildcleaner: keep + "//third_party/nearby/internal/interop:authentication_status", + "//third_party/nearby/sharing/common:compatible_u8_string", ], ) @@ -48,18 +48,18 @@ cc_library( "//location/nearby/cpp/sharing:__subpackages__", "//location/nearby/sharing/sdk/quick_share_server:__pkg__", "//location/nearby/testing/nearby_native:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//internal/network:url", - "//sharing/common:compatible_u8_string", - "//sharing/common:enum", - "//sharing/internal/base", - "//sharing/proto:wire_format_cc_proto", - "@com_google_absl//absl/random", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", + "//third_party/absl/random", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:string_view", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/sharing/common:compatible_u8_string", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/internal/base", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", ], ) @@ -80,20 +80,20 @@ cc_library( "//location/nearby/cpp/sharing:__subpackages__", "//location/nearby/sharing/sdk/quick_share_server:__pkg__", "//location/nearby/testing/nearby_native:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":connection_types", - "//internal/network:url", - "//sharing/common:enum", - "//sharing/internal/public:logging", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:wire_format_cc_proto", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", ], ) @@ -111,11 +111,11 @@ cc_library( "//location/nearby/cpp/sharing:__subpackages__", "//location/nearby/sharing/sdk/quick_share_server:__pkg__", "//location/nearby/testing/nearby_native:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", ], ) @@ -123,12 +123,12 @@ cc_library( name = "nearby_sharing_decoder", hdrs = ["nearby_sharing_decoder.h"], visibility = [ - "//sharing/fuzzing:__pkg__", + "//third_party/nearby/sharing/fuzzing:__pkg__", ], deps = [ ":types", - "//sharing/proto:wire_format_cc_proto", - "@com_google_absl//absl/types:span", + "//third_party/absl/types:span", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", ], ) @@ -136,11 +136,11 @@ cc_library( name = "worker_queue", hdrs = ["worker_queue.h"], deps = [ - "//internal/platform:types", - "//sharing/internal/public:logging", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/synchronization", + "//third_party/absl/base:core_headers", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/synchronization", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/internal/public:logging", ], ) @@ -151,13 +151,13 @@ cc_library( deps = [ ":thread_timer", ":types", - "//internal/platform:types", - "//sharing/internal/public:logging", - "//sharing/proto:wire_format_cc_proto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/memory", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", ], ) @@ -167,15 +167,15 @@ cc_library( hdrs = ["paired_key_verification_runner.h"], deps = [ ":incoming_frame_reader", - "//internal/platform:types", - "//proto:sharing_enums_cc_proto", - "//sharing/certificates", - "//sharing/internal/public:logging", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:share_cc_proto", - "//sharing/proto:wire_format_cc_proto", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/time", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/proto:sharing_enums_cc_proto", + "//third_party/nearby/sharing/certificates", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", ], ) @@ -184,11 +184,11 @@ cc_library( srcs = ["thread_timer.cc"], hdrs = ["thread_timer.h"], deps = [ - "//internal/platform:types", - "//sharing/internal/public:logging", - "@com_google_absl//absl/debugging:leak_check", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/time", + "//third_party/absl/debugging:leak_check", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/internal/public:logging", ], ) @@ -217,23 +217,23 @@ cc_library( ":transfer_metadata", ":types", ":worker_queue", - "//internal/base:files", - "//internal/platform:types", - "//proto:sharing_enums_cc_proto", - "//sharing/analytics", - "//sharing/certificates", - "//sharing/common:compatible_u8_string", - "//sharing/internal/api:platform", - "//sharing/internal/public:logging", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:wire_format_cc_proto", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/strings:str_format", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/base:files", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/proto:sharing_enums_cc_proto", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/certificates", + "//third_party/nearby/sharing/common:compatible_u8_string", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", ], ) @@ -244,11 +244,11 @@ cc_library( deps = [ ":connection_types", ":types", - "//internal/platform:types", - "//sharing/internal/public:logging", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", + "//third_party/absl/base:core_headers", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/internal/public:logging", ], ) @@ -296,7 +296,7 @@ cc_library( "//location/nearby/cpp/sharing:__subpackages__", "//location/nearby/sharing/sdk/quick_share_server:__pkg__", "//location/nearby/testing/nearby_native:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ ":attachments", @@ -309,52 +309,52 @@ cc_library( ":thread_timer", ":transfer_metadata", ":types", - "//connections:core", - "//connections:core_types", - "//connections/implementation:internal", - "//internal/analytics:event_logger", - "//internal/base", - "//internal/base:bluetooth_address", - "//internal/flags:nearby_flags", - "//internal/network:url", - "//internal/platform:base", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", - "//proto:sharing_enums_cc_proto", - "//sharing/analytics", - "//sharing/certificates", - "//sharing/common", - "//sharing/common:compatible_u8_string", - "//sharing/common:enum", - "//sharing/contacts", - "//sharing/fast_initiation:nearby_fast_initiation", - "//sharing/flags/generated:generated_flags", - "//sharing/internal/api:platform", - "//sharing/internal/base", - "//sharing/internal/public:logging", - "//sharing/internal/public:nearby_context", - "//sharing/internal/public:types", - "//sharing/local_device_data", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:share_cc_proto", - "//sharing/proto:wire_format_cc_proto", - "//sharing/scheduling", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/meta:type_traits", - "@com_google_absl//absl/random", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/algorithm:container", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/hash", + "//third_party/absl/meta:type_traits", + "//third_party/absl/random", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/connections:core", + "//third_party/nearby/connections:core_types", + "//third_party/nearby/connections/implementation:internal", + "//third_party/nearby/internal/analytics:event_logger", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform:base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/proto:sharing_enums_cc_proto", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/certificates", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/common:compatible_u8_string", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/contacts", + "//third_party/nearby/sharing/fast_initiation:nearby_fast_initiation", + "//third_party/nearby/sharing/flags/generated:generated_flags", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/base", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:nearby_context", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/local_device_data", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", + "//third_party/nearby/sharing/scheduling", ], ) @@ -376,19 +376,19 @@ cc_library( ":nearby_sharing_service", ":transfer_metadata", ":types", - "//internal/base", - "//internal/platform:types", - "//sharing/common:enum", - "//sharing/internal/api:platform", - "//sharing/internal/public:logging", - "//sharing/local_device_data", - "//sharing/proto:enums_cc_proto", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", + "//third_party/absl/algorithm:container", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/local_device_data", + "//third_party/nearby/sharing/proto:enums_cc_proto", ], ) @@ -399,7 +399,7 @@ cc_library( hdrs = ["attachment_compare.h"], deps = [ ":attachments", - "@com_google_absl//absl/strings", + "//third_party/absl/strings", ], ) @@ -418,9 +418,9 @@ cc_test( srcs = ["advertisement_test.cc"], deps = [ ":types", - "//sharing/common:enum", + "//third_party/absl/types:span", + "//third_party/nearby/sharing/common:enum", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) @@ -446,26 +446,26 @@ cc_test( ":paired_key_verification_runner", ":test_support", ":types", - "//internal/platform:types", - "//internal/test", - "//proto:sharing_enums_cc_proto", - "//sharing/certificates", - "//sharing/certificates:test_support", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "//sharing/internal/test:nearby_test", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:share_cc_proto", - "//sharing/proto:wire_format_cc_proto", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/test", + "//third_party/nearby/proto:sharing_enums_cc_proto", + "//third_party/nearby/sharing/certificates", + "//third_party/nearby/sharing/certificates:test_support", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ "@platforms//os:windows": [ - "//internal/platform/implementation/windows", + "//third_party/nearby/internal/platform/implementation/windows", ], "//conditions:default": [ - "//internal/platform/implementation/g3", + "//third_party/nearby/internal/platform/implementation/g3", ], }), ) @@ -477,7 +477,7 @@ cc_test( ], deps = [ ":nearby_sharing_service", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -490,13 +490,13 @@ cc_test( ":incoming_frame_reader", ":nearby_connection_impl", ":test_support", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/internal/public:logging", - "//sharing/proto:wire_format_cc_proto", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -508,12 +508,12 @@ cc_test( ":incoming_frame_reader", ":nearby_connection_impl", ":test_support", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/proto:wire_format_cc_proto", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -528,21 +528,21 @@ cc_test( ":connection_types", ":nearby_sharing_service", ":types", - "//internal/flags:nearby_flags", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/common:enum", - "//sharing/flags/generated:generated_flags", - "//sharing/internal/public:types", - "//sharing/internal/test:nearby_test", - "//sharing/proto:enums_cc_proto", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/strings:string_view", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/absl/types:span", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/flags/generated:generated_flags", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/proto:enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) @@ -562,41 +562,41 @@ cc_test( ":transfer_metadata_matchers", ":types", "//base:casts", - "//internal/analytics:mock_event_logger", - "//internal/flags:nearby_flags", - "//internal/platform/implementation:signin_attempt", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//internal/test:mocks", - "//sharing/analytics", - "//sharing/certificates", - "//sharing/certificates:test_support", - "//sharing/common", - "//sharing/common:compatible_u8_string", - "//sharing/common:enum", - "//sharing/contacts", - "//sharing/contacts:test_support", - "//sharing/fast_initiation:nearby_fast_initiation", - "//sharing/fast_initiation:test_support", - "//sharing/flags/generated:generated_flags", - "//sharing/internal/api:mock_sharing_platform", - "//sharing/internal/api:platform", - "//sharing/internal/public:types", - "//sharing/internal/test:nearby_test", - "//sharing/local_device_data", - "//sharing/local_device_data:test_support", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:share_cc_proto", - "//sharing/proto:wire_format_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/memory", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/strings:string_view", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform/implementation:signin_attempt", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/internal/test:mocks", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/certificates", + "//third_party/nearby/sharing/certificates:test_support", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/common:compatible_u8_string", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/contacts", + "//third_party/nearby/sharing/contacts:test_support", + "//third_party/nearby/sharing/fast_initiation:nearby_fast_initiation", + "//third_party/nearby/sharing/fast_initiation:test_support", + "//third_party/nearby/sharing/flags/generated:generated_flags", + "//third_party/nearby/sharing/internal/api:mock_sharing_platform", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/local_device_data", + "//third_party/nearby/sharing/local_device_data:test_support", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", "@com_google_protobuf//:protobuf_lite", ], @@ -607,7 +607,7 @@ cc_test( srcs = ["nearby_connections_stream_buffer_manager_test.cc"], deps = [ ":nearby_sharing_service", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -620,8 +620,8 @@ cc_test( ":connection_types", ":nearby_sharing_service", ":types", - "//connections:core_types", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/connections:core_types", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -632,12 +632,12 @@ cc_test( srcs = ["nearby_file_handler_test.cc"], deps = [ ":share_session", - "//internal/base:files", - "//internal/platform/implementation/g3", # fixdeps: keep - "//sharing/internal/api:mock_sharing_platform", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/base:files", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/sharing/internal/api:mock_sharing_platform", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -648,11 +648,11 @@ cc_test( deps = [ ":attachments", ":nearby_sharing_service", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/internal/test:nearby_test", - "//sharing/local_device_data:test_support", - "//sharing/proto:wire_format_cc_proto", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/local_device_data:test_support", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -663,20 +663,20 @@ cc_test( srcs = ["nearby_sharing_settings_test.cc"], deps = [ ":nearby_sharing_service", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/common", - "//sharing/common:compatible_u8_string", - "//sharing/common:enum", - "//sharing/internal/test:nearby_test", - "//sharing/local_device_data:test_support", - "//sharing/proto:enums_cc_proto", + "//third_party/absl/base:core_headers", + "//third_party/absl/strings:string_view", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/common:compatible_u8_string", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/local_device_data:test_support", + "//third_party/nearby/sharing/proto:enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) @@ -689,13 +689,13 @@ cc_test( ":connection_types", ":share_session", ":transfer_metadata", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/proto:wire_format_cc_proto", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -705,8 +705,8 @@ cc_test( srcs = ["share_target_test.cc"], deps = [ ":types", - "//internal/network:url", - "//sharing/common:enum", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/sharing/common:enum", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -717,7 +717,7 @@ cc_test( srcs = ["text_attachment_test.cc"], deps = [ ":attachments", - "//sharing/proto:wire_format_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -729,13 +729,13 @@ cc_test( deps = [ ":connection_types", ":nearby_sharing_service", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/internal/test:nearby_test", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/internal/test:nearby_test", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -762,15 +762,15 @@ cc_test( ":transfer_metadata", ":transfer_metadata_matchers", ":types", - "//internal/analytics:mock_event_logger", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/analytics", - "//sharing/certificates:test_support", + "//third_party/absl/strings:string_view", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/certificates:test_support", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -792,7 +792,7 @@ cc_test( deps = [ ":nearby_sharing_service", ":types", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -811,17 +811,17 @@ cc_test( ":transfer_metadata", ":transfer_metadata_matchers", ":types", - "//internal/analytics:mock_event_logger", - "//internal/network:url", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/analytics", - "//sharing/certificates:test_support", - "//sharing/common:enum", - "//sharing/proto:wire_format_cc_proto", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/certificates:test_support", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -840,18 +840,18 @@ cc_test( ":transfer_metadata", ":transfer_metadata_matchers", ":types", - "//internal/analytics:mock_event_logger", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//proto:sharing_enums_cc_proto", - "//sharing/analytics", - "//sharing/internal/public:logging", - "//sharing/proto:wire_format_cc_proto", - "//sharing/proto/analytics:sharing_log_cc_proto", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/proto:sharing_enums_cc_proto", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", + "//third_party/nearby/sharing/proto/analytics:sharing_log_cc_proto", "//third_party/protobuf", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -861,11 +861,11 @@ cc_test( srcs = ["thread_timer_test.cc"], deps = [ ":thread_timer", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) @@ -876,8 +876,8 @@ cc_test( deps = [ ":connection_types", ":nearby_sharing_service", - "//internal/platform:types", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -888,10 +888,10 @@ cc_test( srcs = ["worker_queue_test.cc"], deps = [ ":worker_queue", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", + "//third_party/absl/synchronization", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/synchronization", "@com_google_googletest//:gtest_main", ], ) diff --git a/sharing/analytics/BUILD b/sharing/analytics/BUILD index 467999a17d..e0dfe7673e 100644 --- a/sharing/analytics/BUILD +++ b/sharing/analytics/BUILD @@ -26,16 +26,16 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/analytics:event_logger", - "//proto:sharing_enums_cc_proto", - "//sharing:attachments", - "//sharing:types", - "//sharing/common:enum", - "//sharing/proto:enums_cc_proto", - "//sharing/proto/analytics:sharing_log_cc_proto", - "@com_google_absl//absl/random", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", + "//third_party/absl/random", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/nearby/internal/analytics:event_logger", + "//third_party/nearby/proto:sharing_enums_cc_proto", + "//third_party/nearby/sharing:attachments", + "//third_party/nearby/sharing:types", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto/analytics:sharing_log_cc_proto", "@com_google_protobuf//:protobuf", "@com_google_protobuf//:protobuf_lite", ], @@ -46,18 +46,18 @@ cc_test( srcs = ["analytics_recorder_test.cc"], deps = [ ":analytics", - "//internal/analytics:mock_event_logger", - "//internal/platform/implementation/g3", # fixdeps: keep - "//proto:sharing_enums_cc_proto", - "//sharing:attachments", - "//sharing:types", - "//sharing/common:enum", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:wire_format_cc_proto", - "//sharing/proto/analytics:sharing_log_cc_proto", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/analytics:mock_event_logger", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/proto:sharing_enums_cc_proto", + "//third_party/nearby/sharing:attachments", + "//third_party/nearby/sharing:types", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:wire_format_cc_proto", + "//third_party/nearby/sharing/proto/analytics:sharing_log_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", "@com_google_protobuf//:protobuf", ], diff --git a/sharing/analytics/analytics_recorder_test.cc b/sharing/analytics/analytics_recorder_test.cc index 91b30505b5..4122e7423f 100644 --- a/sharing/analytics/analytics_recorder_test.cc +++ b/sharing/analytics/analytics_recorder_test.cc @@ -21,7 +21,6 @@ #include "google/protobuf/duration.pb.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" diff --git a/sharing/attachment_container_test.cc b/sharing/attachment_container_test.cc index ce59804245..b863388dfc 100644 --- a/sharing/attachment_container_test.cc +++ b/sharing/attachment_container_test.cc @@ -20,7 +20,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "sharing/attachment.h" #include "sharing/attachment_compare.h" // IWYU pragma: keep diff --git a/sharing/certificates/BUILD b/sharing/certificates/BUILD index 334431086d..0668c503ce 100644 --- a/sharing/certificates/BUILD +++ b/sharing/certificates/BUILD @@ -39,38 +39,38 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/base", - "//internal/crypto_cros", - "//internal/flags:nearby_flags", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//proto/identity/v1:resources_cc_proto", - "//proto/identity/v1:rpcs_cc_proto", - "//sharing/common", - "//sharing/common:enum", - "//sharing/contacts", - "//sharing/flags/generated:generated_flags", - "//sharing/internal/api:platform", - "//sharing/internal/base", - "//sharing/internal/impl/common:nearby_identity_grpc_client", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "//sharing/local_device_data", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:share_cc_proto", - "//sharing/scheduling", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/random", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/container:btree", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/memory", + "//third_party/absl/random", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/proto/identity/v1:resources_cc_proto", + "//third_party/nearby/proto/identity/v1:rpcs_cc_proto", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/contacts", + "//third_party/nearby/sharing/flags/generated:generated_flags", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/base", + "//third_party/nearby/sharing/internal/impl/common:nearby_identity_grpc_client", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/local_device_data", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/scheduling", "@com_google_protobuf//:protobuf_lite", ], ) @@ -91,18 +91,18 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":certificates", - "//internal/base:bluetooth_address", - "//internal/crypto_cros", - "//sharing/common:enum", - "//sharing/contacts", - "//sharing/internal/api:platform", - "//sharing/internal/public:types", - "//sharing/local_device_data", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:share_cc_proto", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/contacts", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/local_device_data", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:share_cc_proto", ], ) @@ -118,32 +118,32 @@ cc_test( deps = [ ":certificates", ":test_support", - "//internal/flags:nearby_flags", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//proto/identity/v1:resources_cc_proto", - "//proto/identity/v1:rpcs_cc_proto", - "//sharing/common", - "//sharing/common:enum", - "//sharing/contacts:test_support", - "//sharing/flags/generated:generated_flags", - "//sharing/internal/api:mock_sharing_platform", - "//sharing/internal/public:logging", - "//sharing/internal/test:nearby_test", - "//sharing/local_device_data:test_support", - "//sharing/proto:enums_cc_proto", - "//sharing/proto:share_cc_proto", - "//sharing/scheduling", - "//sharing/scheduling:test_support", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/proto/identity/v1:resources_cc_proto", + "//third_party/nearby/proto/identity/v1:rpcs_cc_proto", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/contacts:test_support", + "//third_party/nearby/sharing/flags/generated:generated_flags", + "//third_party/nearby/sharing/internal/api:mock_sharing_platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/local_device_data:test_support", + "//third_party/nearby/sharing/proto:enums_cc_proto", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/scheduling", + "//third_party/nearby/sharing/scheduling:test_support", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest_main", ], ) diff --git a/sharing/certificates/nearby_share_certificate_manager_impl_test.cc b/sharing/certificates/nearby_share_certificate_manager_impl_test.cc index 326fb20092..b5aeab31d9 100644 --- a/sharing/certificates/nearby_share_certificate_manager_impl_test.cc +++ b/sharing/certificates/nearby_share_certificate_manager_impl_test.cc @@ -26,7 +26,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" diff --git a/sharing/certificates/nearby_share_certificate_storage_impl_test.cc b/sharing/certificates/nearby_share_certificate_storage_impl_test.cc index e000d98fb4..a47c53093b 100644 --- a/sharing/certificates/nearby_share_certificate_storage_impl_test.cc +++ b/sharing/certificates/nearby_share_certificate_storage_impl_test.cc @@ -27,7 +27,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/functional/any_invocable.h" #include "absl/strings/escaping.h" diff --git a/sharing/common/BUILD b/sharing/common/BUILD index c320f6bb9a..ee4e31782c 100644 --- a/sharing/common/BUILD +++ b/sharing/common/BUILD @@ -26,11 +26,11 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//sharing/internal/api:platform", - "//sharing/proto:enums_cc_proto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/time", + "//third_party/absl/base:core_headers", + "//third_party/absl/status", + "//third_party/absl/time", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/proto:enums_cc_proto", ], ) @@ -48,6 +48,6 @@ cc_library( "//location/nearby/apps/better_together:__subpackages__", "//location/nearby/cpp/sharing/clients/dart:__subpackages__", "//location/nearby/sharing/sdk:__subpackages__", - "//sharing:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], ) diff --git a/sharing/contacts/BUILD b/sharing/contacts/BUILD index bf3a3e9bbb..dc4a6ba255 100644 --- a/sharing/contacts/BUILD +++ b/sharing/contacts/BUILD @@ -28,27 +28,27 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/base", - "//internal/crypto_cros", - "//internal/flags:nearby_flags", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//sharing/common", - "//sharing/flags/generated:generated_flags", - "//sharing/internal/api:platform", - "//sharing/internal/base", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "//sharing/local_device_data", - "//sharing/proto:share_cc_proto", - "//sharing/scheduling", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/functional:bind_front", + "//third_party/absl/memory", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/crypto_cros", + "//third_party/nearby/internal/flags:nearby_flags", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/flags/generated:generated_flags", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/base", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/local_device_data", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/scheduling", ], ) @@ -64,11 +64,11 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":contacts", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", - "//sharing/internal/api:platform", - "//sharing/internal/public:types", - "//sharing/local_device_data", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/local_device_data", ], ) @@ -80,24 +80,24 @@ cc_test( ], deps = [ ":contacts", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/common", - "//sharing/internal/api:mock_sharing_platform", - "//sharing/internal/api:platform", - "//sharing/internal/test:nearby_test", - "//sharing/local_device_data:test_support", - "//sharing/proto:share_cc_proto", - "//sharing/scheduling", - "//sharing/scheduling:test_support", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/container:flat_hash_set", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/internal/api:mock_sharing_platform", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/local_device_data:test_support", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/scheduling", + "//third_party/nearby/sharing/scheduling:test_support", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/sharing/contacts/nearby_share_contacts_sorter_test.cc b/sharing/contacts/nearby_share_contacts_sorter_test.cc index 4c50a8ff03..6cdb7f6954 100644 --- a/sharing/contacts/nearby_share_contacts_sorter_test.cc +++ b/sharing/contacts/nearby_share_contacts_sorter_test.cc @@ -22,7 +22,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "sharing/proto/rpc_resources.pb.h" diff --git a/sharing/fast_initiation/BUILD b/sharing/fast_initiation/BUILD index 3f67af3cc9..5e92410fdc 100644 --- a/sharing/fast_initiation/BUILD +++ b/sharing/fast_initiation/BUILD @@ -25,10 +25,10 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/base", - "//sharing/internal/api:platform", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", + "//third_party/nearby/internal/base", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", ], ) @@ -45,10 +45,10 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":nearby_fast_initiation", - "//internal/base", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "@com_google_absl//absl/memory", + "//third_party/absl/memory", + "//third_party/nearby/internal/base", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", ], ) @@ -60,9 +60,9 @@ cc_test( deps = [ ":nearby_fast_initiation", ":test_support", - "//internal/platform/implementation/g3", # fixdeps: keep - "//sharing/internal/api:platform", - "//sharing/internal/test:nearby_test", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/test:nearby_test", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/sharing/flags/generated/BUILD b/sharing/flags/generated/BUILD index d5fcb19de5..b14b30d1b1 100644 --- a/sharing/flags/generated/BUILD +++ b/sharing/flags/generated/BUILD @@ -5,8 +5,8 @@ cc_library( hdrs = ["nearby_sharing_feature_flags.h"], visibility = ["//visibility:public"], deps = [ - "//internal/flags:flag_reader", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/strings:string_view", + "//third_party/absl/container:btree", + "//third_party/absl/strings:string_view", + "//third_party/nearby/internal/flags:flag_reader", ], ) diff --git a/sharing/incoming_share_session_test.cc b/sharing/incoming_share_session_test.cc index 68826e6e85..d8756f6449 100644 --- a/sharing/incoming_share_session_test.cc +++ b/sharing/incoming_share_session_test.cc @@ -25,7 +25,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" diff --git a/sharing/internal/api/BUILD b/sharing/internal/api/BUILD index 9c79d487d4..d25d6de2ed 100644 --- a/sharing/internal/api/BUILD +++ b/sharing/internal/api/BUILD @@ -35,20 +35,20 @@ cc_library( "//location/nearby/analytics/cpp/logging:__pkg__", "//location/nearby/cpp/sharing:__subpackages__", "//location/nearby/sharing/sdk/test_client:__pkg__", - "//sharing:__subpackages__", + "//third_party/nearby/sharing:__subpackages__", ], deps = [ - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//proto/identity/v1:rpcs_cc_proto", - "//sharing/analytics", - "//sharing/proto:share_cc_proto", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings:string_view", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/proto/identity/v1:rpcs_cc_proto", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/proto:share_cc_proto", ], ) @@ -73,15 +73,15 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":platform", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//sharing/analytics", - "//sharing/proto:share_cc_proto", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/types:span", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/sharing/analytics", + "//third_party/nearby/sharing/proto:share_cc_proto", "@com_google_googletest//:gtest_for_library_testonly", ], ) diff --git a/sharing/internal/base/BUILD b/sharing/internal/base/BUILD index 6363767533..2144461ea7 100644 --- a/sharing/internal/base/BUILD +++ b/sharing/internal/base/BUILD @@ -20,6 +20,7 @@ cc_library( "utf_string_conversions.h", ], visibility = ["//visibility:public"], + deps = ["//third_party/nearby/sharing/internal/base/strings"], ) cc_library( @@ -34,10 +35,10 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/base:no_destructor", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:no_destructor", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings", + "//third_party/absl/types:span", ], ) @@ -52,7 +53,7 @@ cc_test( shard_count = 8, deps = [ ":base", - "//internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], diff --git a/sharing/internal/public/BUILD b/sharing/internal/public/BUILD index 1dc3ee2876..5706782d25 100644 --- a/sharing/internal/public/BUILD +++ b/sharing/internal/public/BUILD @@ -22,11 +22,11 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/network:url", - "//internal/platform:types", - "//sharing/internal/api:platform", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/internal/api:platform", ], ) @@ -44,12 +44,12 @@ cc_library( deps = [ ":logging", ":types", - "//internal/network:url", - "//internal/platform:types", - "//sharing/internal/api:platform", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/internal/api:platform", ], ) @@ -64,8 +64,8 @@ cc_test( deps = [ ":nearby_context", ":types", - "//internal/platform/implementation/g3", # fixdeps: keep - "//sharing/internal/api:mock_sharing_platform", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/sharing/internal/api:mock_sharing_platform", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ], @@ -78,7 +78,7 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", + "//third_party/absl/log", + "//third_party/absl/log:check", ], ) diff --git a/sharing/internal/public/connectivity_manager_impl_test.cc b/sharing/internal/public/connectivity_manager_impl_test.cc index 3d9f60a3db..f73eb165a6 100644 --- a/sharing/internal/public/connectivity_manager_impl_test.cc +++ b/sharing/internal/public/connectivity_manager_impl_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "sharing/internal/api/mock_network_monitor.h" #include "sharing/internal/api/mock_sharing_platform.h" diff --git a/sharing/internal/test/BUILD b/sharing/internal/test/BUILD index 682d30ab4f..652db79d2f 100644 --- a/sharing/internal/test/BUILD +++ b/sharing/internal/test/BUILD @@ -36,23 +36,23 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/base", - "//internal/base:bluetooth_address", - "//internal/network:url", - "//internal/platform:types", - "//internal/test", - "//sharing/internal/api:platform", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "//sharing/proto:share_cc_proto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "//third_party/absl/base:core_headers", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/status", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/absl/types:span", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/base:bluetooth_address", + "//third_party/nearby/internal/network:url", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/proto:share_cc_proto", ], ) @@ -70,18 +70,18 @@ cc_test( shard_count = 8, deps = [ ":nearby_test", - "//internal/network:types", - "//internal/platform:types", - "//internal/platform/implementation/g3", # fixdeps: keep - "//sharing/internal/api:platform", # fixdeps: keep - "//sharing/internal/public:types", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/synchronization", + "//third_party/absl/time", + "//third_party/nearby/internal/network:types", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/sharing/internal/api:platform", # fixdeps: keep + "//third_party/nearby/sharing/internal/public:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/sharing/local_device_data/BUILD b/sharing/local_device_data/BUILD index c599a20333..e1a37b386d 100644 --- a/sharing/local_device_data/BUILD +++ b/sharing/local_device_data/BUILD @@ -26,27 +26,27 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "//internal/base", - "//internal/platform:types", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation:types", - "//proto/identity/v1:resources_cc_proto", - "//proto/identity/v1:rpcs_cc_proto", - "//sharing/common", - "//sharing/common:enum", - "//sharing/internal/api:platform", - "//sharing/internal/base:utf_utils", - "//sharing/internal/impl/common:nearby_identity_grpc_client", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "//sharing/proto:share_cc_proto", + "//third_party/absl/algorithm", + "//third_party/absl/functional:any_invocable", + "//third_party/absl/memory", + "//third_party/absl/random", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/nearby/internal/base", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation:types", + "//third_party/nearby/proto/identity/v1:resources_cc_proto", + "//third_party/nearby/proto/identity/v1:rpcs_cc_proto", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/base:utf_utils", + "//third_party/nearby/sharing/internal/impl/common:nearby_identity_grpc_client", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/proto:share_cc_proto", "//util/hash:highway_fingerprint", - "@com_google_absl//absl/algorithm", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/random", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", ], ) @@ -62,11 +62,11 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":local_device_data", - "//sharing/common:enum", - "//sharing/internal/api:platform", - "//sharing/internal/public:types", - "//sharing/proto:share_cc_proto", - "@com_google_absl//absl/strings", + "//third_party/absl/strings", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/proto:share_cc_proto", ], ) @@ -77,25 +77,25 @@ cc_test( ], deps = [ ":local_device_data", - "//internal/platform/implementation:account_manager", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//proto/identity/v1:resources_cc_proto", - "//proto/identity/v1:rpcs_cc_proto", - "//sharing/common", - "//sharing/common:enum", - "//sharing/internal/api:mock_sharing_platform", - "//sharing/internal/public:logging", - "//sharing/internal/test:nearby_test", - "//sharing/proto:share_cc_proto", - "//sharing/scheduling", - "//sharing/scheduling:test_support", + "//third_party/absl/status", + "//third_party/absl/status:statusor", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/absl/types:optional", + "//third_party/nearby/internal/platform/implementation:account_manager", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/proto/identity/v1:resources_cc_proto", + "//third_party/nearby/proto/identity/v1:rpcs_cc_proto", + "//third_party/nearby/sharing/common", + "//third_party/nearby/sharing/common:enum", + "//third_party/nearby/sharing/internal/api:mock_sharing_platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/test:nearby_test", + "//third_party/nearby/sharing/proto:share_cc_proto", + "//third_party/nearby/sharing/scheduling", + "//third_party/nearby/sharing/scheduling:test_support", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", "@com_google_googletest//:gtest_main", ], ) diff --git a/sharing/nearby_connections_manager_impl_test.cc b/sharing/nearby_connections_manager_impl_test.cc index 9a45c35b0c..0f91298aee 100644 --- a/sharing/nearby_connections_manager_impl_test.cc +++ b/sharing/nearby_connections_manager_impl_test.cc @@ -27,7 +27,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" diff --git a/sharing/nearby_connections_service_test.cc b/sharing/nearby_connections_service_test.cc index 80bcdc6a1d..73ab5bdb7c 100644 --- a/sharing/nearby_connections_service_test.cc +++ b/sharing/nearby_connections_service_test.cc @@ -15,7 +15,6 @@ #include "sharing/nearby_connections_service.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "internal/platform/file.h" #include "sharing/nearby_connections_types.h" diff --git a/sharing/nearby_connections_types_payload_test.cc b/sharing/nearby_connections_types_payload_test.cc index abcaff576a..d672b6bc2d 100644 --- a/sharing/nearby_connections_types_payload_test.cc +++ b/sharing/nearby_connections_types_payload_test.cc @@ -15,7 +15,6 @@ #include "sharing/nearby_connections_types.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace nearby::sharing { diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc index 56527ec48f..39f384b0f0 100644 --- a/sharing/nearby_sharing_service_impl_test.cc +++ b/sharing/nearby_sharing_service_impl_test.cc @@ -31,7 +31,6 @@ #include "base/casts.h" #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/base/thread_annotations.h" #include "absl/memory/memory.h" diff --git a/sharing/outgoing_share_session_test.cc b/sharing/outgoing_share_session_test.cc index 07069331af..786b36fe07 100644 --- a/sharing/outgoing_share_session_test.cc +++ b/sharing/outgoing_share_session_test.cc @@ -22,7 +22,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" diff --git a/sharing/paired_key_verification_runner_test.cc b/sharing/paired_key_verification_runner_test.cc index 1c29383224..977f193721 100644 --- a/sharing/paired_key_verification_runner_test.cc +++ b/sharing/paired_key_verification_runner_test.cc @@ -26,7 +26,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "internal/platform/task_runner.h" diff --git a/sharing/proto/BUILD b/sharing/proto/BUILD index c2fb5be7a6..7459350ffd 100644 --- a/sharing/proto/BUILD +++ b/sharing/proto/BUILD @@ -42,7 +42,7 @@ proto_library( name = "wire_format_proto", srcs = ["wire_format.proto"], visibility = ["//visibility:public"], - deps = ["//proto:sharing_enums_proto"], + deps = ["//third_party/nearby/proto:sharing_enums_proto"], ) cc_proto_library( diff --git a/sharing/proto/analytics/BUILD b/sharing/proto/analytics/BUILD index a8cd2e32b0..b161a702b5 100644 --- a/sharing/proto/analytics/BUILD +++ b/sharing/proto/analytics/BUILD @@ -13,7 +13,6 @@ # limitations under the License. load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library") load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") licenses(["notice"]) @@ -26,7 +25,7 @@ proto_library( "nearby_sharing_log.proto", ], deps = [ - "//proto:sharing_enums_proto", + "//third_party/nearby/proto:sharing_enums_proto", "@com_google_protobuf//:duration_proto", ], ) @@ -35,8 +34,3 @@ cc_proto_library( name = "sharing_log_cc_proto", deps = [":sharing_log_proto"], ) - -java_lite_proto_library( - name = "sharing_log_java_proto_lite", - deps = [":sharing_log_proto"], -) diff --git a/sharing/scheduling/BUILD b/sharing/scheduling/BUILD index 00a381bf81..e79f282c4a 100644 --- a/sharing/scheduling/BUILD +++ b/sharing/scheduling/BUILD @@ -19,8 +19,8 @@ cc_library( srcs = ["format.cc"], hdrs = ["format.h"], deps = [ - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", ], ) @@ -48,12 +48,12 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":format", - "//sharing/internal/api:platform", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", + "//third_party/absl/strings", + "//third_party/absl/strings:str_format", + "//third_party/absl/time", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", ], ) @@ -71,13 +71,13 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":scheduling", - "//internal/platform:types", - "//sharing/internal/api:platform", - "//sharing/internal/public:logging", - "//sharing/internal/public:types", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", + "//third_party/absl/container:flat_hash_map", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform:types", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:logging", + "//third_party/nearby/sharing/internal/public:types", ], ) @@ -93,14 +93,14 @@ cc_test( ], deps = [ ":scheduling", - "//internal/platform/implementation/g3", # fixdeps: keep - "//internal/test", - "//sharing/internal/api:platform", - "//sharing/internal/public:types", - "//sharing/internal/test:nearby_test", + "//third_party/absl/strings", + "//third_party/absl/time", + "//third_party/nearby/internal/platform/implementation/g3", # fixdeps: keep + "//third_party/nearby/internal/test", + "//third_party/nearby/sharing/internal/api:platform", + "//third_party/nearby/sharing/internal/public:types", + "//third_party/nearby/sharing/internal/test:nearby_test", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/sharing/scheduling/nearby_share_scheduler_utils_test.cc b/sharing/scheduling/nearby_share_scheduler_utils_test.cc index 5fa9555161..b7703ab709 100644 --- a/sharing/scheduling/nearby_share_scheduler_utils_test.cc +++ b/sharing/scheduling/nearby_share_scheduler_utils_test.cc @@ -19,7 +19,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "sharing/internal/api/preference_manager.h" diff --git a/sharing/share_session_test.cc b/sharing/share_session_test.cc index 4c892144a5..66b56b4226 100644 --- a/sharing/share_session_test.cc +++ b/sharing/share_session_test.cc @@ -22,7 +22,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "absl/synchronization/notification.h" diff --git a/sharing/wrapped_share_target_discovered_callback_test.cc b/sharing/wrapped_share_target_discovered_callback_test.cc index c3e77e4d04..63b743a92f 100644 --- a/sharing/wrapped_share_target_discovered_callback_test.cc +++ b/sharing/wrapped_share_target_discovered_callback_test.cc @@ -17,7 +17,6 @@ #include #include "gmock/gmock.h" -#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "sharing/advertisement.h" #include "sharing/share_target.h"