diff --git a/connections/implementation/mediums/BUILD b/connections/implementation/mediums/BUILD index e4885ae3..4659b044 100644 --- a/connections/implementation/mediums/BUILD +++ b/connections/implementation/mediums/BUILD @@ -46,6 +46,14 @@ cc_library( ], deps = [ ":utils", + "@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:bind_front", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/time", + "@com_google_absl//absl/types:optional", "//connections:core_types", "//connections/implementation/mediums/ble_v2", "//connections/implementation/mediums/webrtc", @@ -57,14 +65,6 @@ cc_library( "//internal/platform:types", "//internal/platform:uuid", "//proto/mediums:web_rtc_signaling_frames_cc_proto", - "@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:bind_front", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", ] + select({ "@platforms//cpu:arm": [], "//conditions:default": [ diff --git a/connections/implementation/mediums/webrtc/BUILD b/connections/implementation/mediums/webrtc/BUILD index fa453148..a344b3a7 100644 --- a/connections/implementation/mediums/webrtc/BUILD +++ b/connections/implementation/mediums/webrtc/BUILD @@ -32,6 +32,8 @@ cc_library( ], deps = [ ":data_types", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/time", "//connections:core_types", "//connections/implementation/mediums:utils", "//internal/platform:base", @@ -39,8 +41,6 @@ cc_library( "//internal/platform:logging", "//internal/platform:types", "//proto/mediums:web_rtc_signaling_frames_cc_proto", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/time", ] + select({ "@platforms//cpu:arm": [], "//conditions:default": [ diff --git a/internal/platform/BUILD b/internal/platform/BUILD index 433aca27..c3d09329 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -407,13 +407,13 @@ cc_library( ":logging", ":types", ":uuid", - "//internal/platform/implementation:comm", - "//internal/platform/implementation:platform", "@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", + "//internal/platform/implementation:comm", + "//internal/platform/implementation:platform", ] + select({ "@platforms//cpu:arm": [], "//conditions:default": [ diff --git a/internal/platform/implementation/BUILD b/internal/platform/implementation/BUILD index 75529c2a..7bfea795 100644 --- a/internal/platform/implementation/BUILD +++ b/internal/platform/implementation/BUILD @@ -82,18 +82,18 @@ cc_library( "//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", "@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", + "//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", ] + select({ "@platforms//cpu:arm": [], "//conditions:default": [ diff --git a/presence/BUILD b/presence/BUILD index 8b417166..c7f053c5 100644 --- a/presence/BUILD +++ b/presence/BUILD @@ -92,13 +92,13 @@ cc_test( shard_count = 6, deps = [ ":types", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:variant", "//internal/platform:connection_info", "//internal/platform:logging", "//internal/proto:credential_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({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -118,11 +118,11 @@ cc_test( ], shard_count = 6, deps = [ + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", "//internal/platform:uuid", "//internal/proto:credential_cc_proto", "//internal/proto:local_credential_cc_proto", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -144,10 +144,10 @@ cc_test( deps = [ ":presence", ":types", - "//internal/platform:test_util", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/status", + "//internal/platform:test_util", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD index 3985f6f1..f81e5b31 100644 --- a/presence/implementation/BUILD +++ b/presence/implementation/BUILD @@ -81,19 +81,6 @@ cc_library( "//presence:__subpackages__", ], deps = [ - "//internal/crypto", - "//internal/platform:base", - "//internal/platform:comm", - "//internal/platform:logging", - "//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", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -109,6 +96,19 @@ cc_library( "@com_google_absl//absl/time", "@com_google_absl//absl/types:optional", "@com_google_absl//absl/types:variant", + "//internal/crypto", + "//internal/platform:base", + "//internal/platform:comm", + "//internal/platform:logging", + "//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", ] + select({ ":norust_or_windows_or_android": [":ldt_stub"], "//conditions:default": ["//third_party/nearby_rust/presence/ldt_np_adv_ffi"], @@ -152,12 +152,12 @@ cc_test( srcs = ["advertisement_decoder_test.cc"], deps = [ ":internal", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/strings", "//internal/platform:base", "//internal/proto:credential_cc_proto", "//presence:types", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -174,14 +174,14 @@ cc_test( srcs = ["advertisement_factory_test.cc"], deps = [ ":internal", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", "//internal/platform:base", "//internal/proto:credential_cc_proto", "//presence:types", "//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({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -198,13 +198,13 @@ cc_test( srcs = ["broadcast_manager_test.cc"], deps = [ ":internal", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", "//internal/platform:base", "//internal/platform:test_util", "//internal/platform:types", "//internal/proto:credential_cc_proto", "//presence/implementation/mediums", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -221,11 +221,11 @@ cc_test( srcs = ["ldt_test.cc"], deps = [ ":internal", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/strings", "//internal/platform:base", "//internal/proto:credential_cc_proto", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -241,11 +241,11 @@ cc_test( srcs = ["base_broadcast_request_test.cc"], deps = [ ":internal", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/types:variant", "//internal/proto:credential_cc_proto", "//presence:types", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/types:variant", - "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -262,10 +262,10 @@ cc_test( srcs = ["action_factory_test.cc"], deps = [ ":internal", - "//presence:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/strings", + "//presence:types", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -282,17 +282,17 @@ cc_test( srcs = ["credential_manager_impl_test.cc"], deps = [ ":internal", + "//net/proto2/contrib/parse_proto:testing", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/time", "//internal/platform:comm", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation:types", "//internal/proto:credential_cc_proto", - "//net/proto2/contrib/parse_proto:testing", - "@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", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", @@ -309,13 +309,13 @@ cc_test( srcs = ["scan_manager_test.cc"], deps = [ ":internal", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/time", "//internal/platform:comm", "//internal/platform:test_util", "//internal/platform:types", "//presence/implementation/mediums", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/time", - "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", diff --git a/presence/implementation/mediums/BUILD b/presence/implementation/mediums/BUILD index c8ebe2df..487d2682 100644 --- a/presence/implementation/mediums/BUILD +++ b/presence/implementation/mediums/BUILD @@ -41,14 +41,14 @@ cc_test( shard_count = 16, deps = [ ":mediums", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_googletest//:gtest_main", "//internal/platform:comm", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform:uuid", "//internal/platform/implementation:comm", "//presence:types", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", diff --git a/presence/scan_request.h b/presence/scan_request.h index 3effad08..69aaad01 100644 --- a/presence/scan_request.h +++ b/presence/scan_request.h @@ -90,7 +90,7 @@ inline bool operator==(const LegacyPresenceScanFilter& a, b.remote_public_credentials.size() || a.extended_properties != b.extended_properties) return false; - for (int i = 0; i < a.remote_public_credentials.size(); ++i) { + for (size_t i = 0; i < a.remote_public_credentials.size(); ++i) { if (a.remote_public_credentials[i].SerializeAsString() != b.remote_public_credentials[i].SerializeAsString()) return false;