From c312442f3d46ba644c556bc05c64de6fd310358e Mon Sep 17 00:00:00 2001 From: Hai Shang Date: Mon, 3 Apr 2023 13:59:27 -0700 Subject: [PATCH] internal clean up PiperOrigin-RevId: 521555239 --- connections/implementation/mediums/BUILD | 16 ++-- .../implementation/mediums/webrtc/BUILD | 4 +- internal/platform/BUILD | 4 +- internal/platform/implementation/BUILD | 12 +-- internal/proto/credential.proto | 1 + internal/proto/local_credential.proto | 1 + internal/proto/metadata.proto | 1 + presence/BUILD | 18 ++--- presence/implementation/BUILD | 80 +++++++++---------- presence/implementation/mediums/BUILD | 4 +- 10 files changed, 72 insertions(+), 69 deletions(-) diff --git a/connections/implementation/mediums/BUILD b/connections/implementation/mediums/BUILD index 4659b044..e4885ae3 100644 --- a/connections/implementation/mediums/BUILD +++ b/connections/implementation/mediums/BUILD @@ -46,14 +46,6 @@ 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", @@ -65,6 +57,14 @@ 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 a344b3a7..fa453148 100644 --- a/connections/implementation/mediums/webrtc/BUILD +++ b/connections/implementation/mediums/webrtc/BUILD @@ -32,8 +32,6 @@ 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", @@ -41,6 +39,8 @@ 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 af83cd26..b6508e38 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -409,13 +409,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 7bfea795..75529c2a 100644 --- a/internal/platform/implementation/BUILD +++ b/internal/platform/implementation/BUILD @@ -82,18 +82,18 @@ cc_library( "//presence/implementation:__subpackages__", ], deps = [ - "@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", + "@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", ] + select({ "@platforms//cpu:arm": [], "//conditions:default": [ diff --git a/internal/proto/credential.proto b/internal/proto/credential.proto index de72b96c..7f719292 100644 --- a/internal/proto/credential.proto +++ b/internal/proto/credential.proto @@ -21,6 +21,7 @@ package nearby.internal; option java_multiple_files = true; option java_package = "com.google.nearby.presence"; option java_outer_classname = "CredentialProto"; +option optimize_for = LITE_RUNTIME; enum IdentityType { IDENTITY_TYPE_UNSPECIFIED = 0; diff --git a/internal/proto/local_credential.proto b/internal/proto/local_credential.proto index 1a1475f5..f24b088c 100644 --- a/internal/proto/local_credential.proto +++ b/internal/proto/local_credential.proto @@ -23,6 +23,7 @@ import "internal/proto/credential.proto"; option java_multiple_files = true; option java_package = "com.google.nearby.presence"; option java_outer_classname = "LocalCredentialProto"; +option optimize_for = LITE_RUNTIME; // The local credential contains information of a local device for // identity encryption and authentication. It should never leave the generating diff --git a/internal/proto/metadata.proto b/internal/proto/metadata.proto index fbd7ff6e..91fdbeb9 100644 --- a/internal/proto/metadata.proto +++ b/internal/proto/metadata.proto @@ -20,6 +20,7 @@ package nearby.internal; option java_multiple_files = true; option java_package = "com.google.nearby.presence"; option java_outer_classname = "MetadataProto"; +option optimize_for = LITE_RUNTIME; // The metadata of a device. // Contains confidential data not to be broadcasted directly in OTA. diff --git a/presence/BUILD b/presence/BUILD index c7f053c5..8b417166 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", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_googletest//:gtest_main", - "@com_google_absl//absl/status", "//internal/platform:test_util", + "@com_github_protobuf_matchers//protobuf-matchers", + "@com_google_absl//absl/status", + "@com_google_googletest//:gtest_main", ] + select({ "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD index f81e5b31..3985f6f1 100644 --- a/presence/implementation/BUILD +++ b/presence/implementation/BUILD @@ -81,6 +81,19 @@ 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", @@ -96,19 +109,6 @@ 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", - "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_googletest//:gtest_main", - "@com_google_absl//absl/strings", "//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", @@ -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 487d2682..c8ebe2df 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",