diff --git a/connections/BUILD b/connections/BUILD index 04cc0ff9..a8f9d09d 100644 --- a/connections/BUILD +++ b/connections/BUILD @@ -35,7 +35,6 @@ cc_library( "//internal/analytics:event_logger", "//internal/interop:device", "//internal/platform:base", - "//internal/platform:logging", "//internal/platform:types", "@com_google_absl//absl/strings", "@com_google_absl//absl/time", @@ -102,7 +101,6 @@ cc_test( "//connections/implementation:internal_test", "//connections/v3:v3_types", "//internal/platform:base", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", diff --git a/connections/c/BUILD b/connections/c/BUILD index c248c76e..17db7c4f 100644 --- a/connections/c/BUILD +++ b/connections/c/BUILD @@ -119,7 +119,7 @@ cc_test( ], deps = [ "//connections:core", - "//internal/platform:logging", + "//internal/platform:types", "//internal/platform/implementation/windows", "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", diff --git a/connections/implementation/BUILD b/connections/implementation/BUILD index bb8eb3e5..2179906b 100644 --- a/connections/implementation/BUILD +++ b/connections/implementation/BUILD @@ -126,7 +126,6 @@ cc_library( "//internal/platform:comm", "//internal/platform:connection_info", "//internal/platform:error_code_recorder", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform:util", "//internal/platform/implementation:comm", @@ -236,7 +235,6 @@ cc_test( "//internal/interop:device", "//internal/platform:base", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep diff --git a/connections/implementation/analytics/BUILD b/connections/implementation/analytics/BUILD index 63989a25..022bb0cd 100644 --- a/connections/implementation/analytics/BUILD +++ b/connections/implementation/analytics/BUILD @@ -31,7 +31,6 @@ cc_library( "//connections:core_types", "//internal/analytics:event_logger", "//internal/platform:error_code_recorder", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform/implementation:types", "//internal/proto/analytics:connections_log_cc_proto", @@ -61,7 +60,6 @@ cc_test( "//internal/platform:base", "//internal/platform:comm", "//internal/platform:error_code_recorder", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep "//internal/proto/analytics:connections_log_cc_proto", diff --git a/connections/implementation/mediums/BUILD b/connections/implementation/mediums/BUILD index 61f968b4..2ef5be09 100644 --- a/connections/implementation/mediums/BUILD +++ b/connections/implementation/mediums/BUILD @@ -55,7 +55,6 @@ cc_library( "//internal/platform:base", "//internal/platform:cancellation_flag", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform:uuid", "//proto/mediums:web_rtc_signaling_frames_cc_proto", diff --git a/connections/implementation/mediums/ble_v2/BUILD b/connections/implementation/mediums/ble_v2/BUILD index 69d727eb..cd9321e8 100644 --- a/connections/implementation/mediums/ble_v2/BUILD +++ b/connections/implementation/mediums/ble_v2/BUILD @@ -45,7 +45,6 @@ cc_library( "//internal/flags:nearby_flags", "//internal/platform:base", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform:util", "//internal/platform:uuid", diff --git a/connections/implementation/mediums/webrtc/BUILD b/connections/implementation/mediums/webrtc/BUILD index 71e5abd2..2d15ee8d 100644 --- a/connections/implementation/mediums/webrtc/BUILD +++ b/connections/implementation/mediums/webrtc/BUILD @@ -39,7 +39,6 @@ cc_library( "//connections/implementation/mediums:utils", "//internal/platform:base", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "//proto/mediums:web_rtc_signaling_frames_cc_proto", # TODO: Support WebRTC diff --git a/fastpair/BUILD b/fastpair/BUILD index ec101847..453b6db5 100644 --- a/fastpair/BUILD +++ b/fastpair/BUILD @@ -134,7 +134,6 @@ cc_test( "//fastpair/plugins:fake_fast_pair_plugin", "//internal/account:test_support", "//internal/network:types", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep diff --git a/fastpair/common/BUILD b/fastpair/common/BUILD index c657c1c4..c377b405 100644 --- a/fastpair/common/BUILD +++ b/fastpair/common/BUILD @@ -33,7 +33,7 @@ cc_library( deps = [ "//fastpair/proto:fastpair_cc_proto", "//internal/crypto_cros", - "//internal/platform:logging", + "//internal/platform:types", "//internal/preferences", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_map", diff --git a/fastpair/crypto/BUILD b/fastpair/crypto/BUILD index cac861f5..674826a6 100644 --- a/fastpair/crypto/BUILD +++ b/fastpair/crypto/BUILD @@ -21,7 +21,7 @@ cc_library( "//fastpair/common", "//internal/base:bluetooth_address", "//internal/platform:base", - "//internal/platform:logging", + "//internal/platform:types", "@boringssl//:crypto", "@com_google_absl//absl/log:check", ], diff --git a/fastpair/dataparser/BUILD b/fastpair/dataparser/BUILD index 58a5f9b6..76f520e6 100644 --- a/fastpair/dataparser/BUILD +++ b/fastpair/dataparser/BUILD @@ -17,7 +17,7 @@ cc_library( "//fastpair/crypto", "//internal/base:bluetooth_address", "//internal/platform:base", - "//internal/platform:logging", + "//internal/platform:types", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/strings", ], diff --git a/fastpair/handshake/BUILD b/fastpair/handshake/BUILD index 1e44021b..c845dac1 100644 --- a/fastpair/handshake/BUILD +++ b/fastpair/handshake/BUILD @@ -43,7 +43,6 @@ cc_library( "//fastpair/repository", "//internal/base:bluetooth_address", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform:uuid", "@boringssl//:crypto", @@ -89,7 +88,6 @@ cc_test( "//fastpair/internal/mediums", "//fastpair/repository:test_support", "//fastpair/testing", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", @@ -164,7 +162,6 @@ cc_test( ":handshake", "//fastpair/common", "//fastpair/internal/mediums", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep diff --git a/fastpair/internal/mediums/BUILD b/fastpair/internal/mediums/BUILD index 561b6f1e..589e6004 100644 --- a/fastpair/internal/mediums/BUILD +++ b/fastpair/internal/mediums/BUILD @@ -37,7 +37,6 @@ cc_library( deps = [ "//fastpair/common", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform/implementation:comm", "@com_google_absl//absl/base:core_headers", diff --git a/fastpair/message_stream/BUILD b/fastpair/message_stream/BUILD index 41969904..0ec782b2 100644 --- a/fastpair/message_stream/BUILD +++ b/fastpair/message_stream/BUILD @@ -60,7 +60,6 @@ cc_library( "//fastpair/common", "//internal/platform:base", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform:uuid", @@ -106,7 +105,6 @@ cc_library( ":message_stream", "//fastpair/common", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "@com_google_absl//absl/status", @@ -128,7 +126,6 @@ cc_test( ":message_stream", "//fastpair/common", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep @@ -153,7 +150,6 @@ cc_test( ":message_stream", "//fastpair/common", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform/implementation:types", diff --git a/fastpair/proto/BUILD b/fastpair/proto/BUILD index ea2c5e6c..1ef59ebb 100644 --- a/fastpair/proto/BUILD +++ b/fastpair/proto/BUILD @@ -37,7 +37,7 @@ cc_library( deps = [ ":fastpair_cc_proto", "//fastpair/common", - "//internal/platform:logging", + "//internal/platform:types", "@com_google_absl//absl/strings", "@nlohmann_json//:json", ], @@ -57,7 +57,7 @@ cc_library( ":fastpair_cc_proto", "//fastpair/common", "//fastpair/repository", - "//internal/platform:logging", + "//internal/platform:types", "@com_google_absl//absl/time", ], ) diff --git a/fastpair/repository/BUILD b/fastpair/repository/BUILD index 747a6462..1f1afc60 100644 --- a/fastpair/repository/BUILD +++ b/fastpair/repository/BUILD @@ -42,7 +42,6 @@ cc_library( "//fastpair/proto:proto_builder", "//fastpair/server_access", "//internal/base", - "//internal/platform:logging", "//internal/platform:types", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", @@ -62,7 +61,6 @@ cc_library( deps = [ "//fastpair/common", "//internal/base", - "//internal/platform:logging", "//internal/platform:types", "@com_google_absl//absl/functional:any_invocable", ], diff --git a/fastpair/retroactive/BUILD b/fastpair/retroactive/BUILD index 33884bf9..63315b12 100644 --- a/fastpair/retroactive/BUILD +++ b/fastpair/retroactive/BUILD @@ -65,8 +65,8 @@ cc_test( "//internal/base:bluetooth_address", "//internal/platform:base", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:test_util", + "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_absl//absl/status", diff --git a/fastpair/scanning/BUILD b/fastpair/scanning/BUILD index 3478b93e..c4b35887 100644 --- a/fastpair/scanning/BUILD +++ b/fastpair/scanning/BUILD @@ -33,7 +33,6 @@ cc_library( "//fastpair/repository:device_repository", "//fastpair/scanning/fastpair:scanning", "//internal/base", - "//internal/platform:logging", "//internal/platform:types", "@com_google_absl//absl/functional:bind_front", ], diff --git a/fastpair/scanning/fastpair/BUILD b/fastpair/scanning/fastpair/BUILD index 3ece0245..f70cd686 100644 --- a/fastpair/scanning/fastpair/BUILD +++ b/fastpair/scanning/fastpair/BUILD @@ -41,7 +41,6 @@ cc_library( "//internal/base", "//internal/platform:base", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/functional:bind_front", diff --git a/fastpair/server_access/BUILD b/fastpair/server_access/BUILD index 6aeffa98..89bfffa7 100644 --- a/fastpair/server_access/BUILD +++ b/fastpair/server_access/BUILD @@ -36,7 +36,6 @@ cc_library( "//internal/auth:types", "//internal/base", "//internal/network:types", - "//internal/platform:logging", "//internal/platform:types", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", diff --git a/fastpair/ui/BUILD b/fastpair/ui/BUILD index 16f74cbc..83ae1108 100644 --- a/fastpair/ui/BUILD +++ b/fastpair/ui/BUILD @@ -37,7 +37,7 @@ cc_library( "//fastpair/common", "//fastpair/repository", "//internal/base", - "//internal/platform:logging", + "//internal/platform:types", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/strings", ], diff --git a/internal/data/BUILD b/internal/data/BUILD index 562703c4..8628ea53 100644 --- a/internal/data/BUILD +++ b/internal/data/BUILD @@ -15,7 +15,7 @@ cc_library( "memory_data_set.h", ], deps = [ - "//internal/platform:logging", + "//internal/platform:types", "//third_party/leveldb:db", "//third_party/leveldb:table", "//third_party/leveldb:util", diff --git a/internal/network/BUILD b/internal/network/BUILD index 634db625..9a1b24f5 100644 --- a/internal/network/BUILD +++ b/internal/network/BUILD @@ -55,7 +55,6 @@ cc_library( ], deps = [ ":types", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform/implementation:platform", "@com_google_absl//absl/base:core_headers", diff --git a/internal/platform/BUILD b/internal/platform/BUILD index fc4597a4..66056d0f 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -94,31 +94,6 @@ cc_library( ], ) -cc_library( - name = "logging", - hdrs = [ - "logging.h", - ], - copts = ["-DCORE_ADAPTER_DLL"], - visibility = [ - "//connections:__subpackages__", - "//fastpair:__subpackages__", - "//internal/auth:__subpackages__", - "//internal/auth/credential_store:__subpackages__", - "//internal/data:__subpackages__", - "//internal/network:__subpackages__", - "//internal/platform:__subpackages__", - "//internal/proto/analytics:__subpackages__", - "//location/nearby/analytics/cpp:__subpackages__", - "//presence:__subpackages__", - ], - deps = [ - "//internal/platform/implementation:platform", - "//internal/platform/implementation:types", - "@com_google_glog//:glog", - ], -) - cc_library( name = "cancellation_flag", srcs = [ @@ -161,7 +136,7 @@ cc_library( "//presence:__subpackages__", ], deps = [ - ":logging", + ":types", "//proto:connections_enums_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", @@ -182,7 +157,7 @@ cc_library( ], visibility = ["//connections/implementation:__subpackages__"], deps = [ - ":logging", + ":types", "//proto:connections_enums_cc_proto", "//proto/errorcode:error_code_enums_cc_proto", "@com_google_absl//absl/functional:any_invocable", @@ -227,7 +202,6 @@ cc_library( ], deps = [ ":base", - ":logging", ":types", ":uuid", "//internal/base", @@ -355,15 +329,21 @@ cc_library( "//connections:__subpackages__", "//fastpair:__subpackages__", "//internal/account:__subpackages__", + "//internal/auth:__subpackages__", + "//internal/auth/credential_store:__subpackages__", "//internal/base:__subpackages__", + "//internal/data:__subpackages__", "//internal/flags:__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/analytics/cpp:__subpackages__", "//location/nearby/cpp:__subpackages__", "//location/nearby/testing/nearby_native:__subpackages__", "//presence:__subpackages__", @@ -371,7 +351,6 @@ cc_library( ], deps = [ ":base", - ":logging", ":util", "//internal/crypto_cros", "//internal/platform/implementation:platform", @@ -427,7 +406,6 @@ cc_library( deps = [ ":base", ":cancellation_flag", - ":logging", ":types", ":uuid", "//internal/base", @@ -488,7 +466,6 @@ cc_test( ":base", ":comm", ":connection_info", - ":logging", ":test_util", ":types", ":uuid", diff --git a/internal/platform/implementation/g3/BUILD b/internal/platform/implementation/g3/BUILD index b20cd459..5dd64cc6 100644 --- a/internal/platform/implementation/g3/BUILD +++ b/internal/platform/implementation/g3/BUILD @@ -44,8 +44,8 @@ cc_library( deps = [ ":preferences_repository", "//internal/platform:base", - "//internal/platform:logging", "//internal/platform:test_util", + "//internal/platform:types", "//internal/platform:util", "//internal/platform/implementation:types", "//internal/platform/implementation/shared:count_down_latch", @@ -103,7 +103,6 @@ cc_library( "@com_google_absl//absl/synchronization", "//internal/platform:base", "//internal/platform:cancellation_flag", - "//internal/platform:logging", "//internal/platform:test_util", "//internal/platform:types", "//internal/platform:uuid", diff --git a/internal/platform/implementation/windows/BUILD b/internal/platform/implementation/windows/BUILD index 9e4ac2f9..8f615664 100644 --- a/internal/platform/implementation/windows/BUILD +++ b/internal/platform/implementation/windows/BUILD @@ -50,7 +50,6 @@ cc_library( "//base:stringprintf", "//internal/base:bluetooth_address", "//internal/platform:base", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform:uuid", "//internal/platform/implementation:types", @@ -205,7 +204,6 @@ cc_library( "//internal/platform:base", "//internal/platform:cancellation_flag", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform:uuid", "//internal/platform/flags:platform_flags", @@ -286,7 +284,7 @@ cc_test( ":types", ":windows", "//internal/platform:base", - "//internal/platform:logging", + "//internal/platform:types", "//internal/platform/implementation:comm", "//internal/platform/implementation:platform", "//internal/platform/implementation:types", diff --git a/internal/proto/analytics/BUILD b/internal/proto/analytics/BUILD index ea1b3b08..904d2182 100644 --- a/internal/proto/analytics/BUILD +++ b/internal/proto/analytics/BUILD @@ -64,7 +64,7 @@ cc_test( shard_count = 16, deps = [ ":connections_log_cc_proto", - "//internal/platform:logging", + "//internal/platform:types", "//internal/platform/implementation/g3", # build_cleaner: keep "//proto:connections_enums_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", diff --git a/presence/BUILD b/presence/BUILD index 9645c99c..c4b38578 100644 --- a/presence/BUILD +++ b/presence/BUILD @@ -91,7 +91,7 @@ cc_library( "//internal/interop:device", "//internal/platform:base", "//internal/platform:connection_info", - "//internal/platform:logging", + "//internal/platform:types", "//internal/platform/implementation:types", "//internal/proto:credential_cc_proto", "//internal/proto:metadata_cc_proto", @@ -122,7 +122,7 @@ cc_test( ":types", "//connections/implementation/proto:offline_wire_formats_cc_proto", "//internal/platform:connection_info", - "//internal/platform:logging", + "//internal/platform:types", "//internal/proto:credential_cc_proto", "//internal/proto:metadata_cc_proto", "@com_github_protobuf_matchers//protobuf-matchers", diff --git a/presence/fpp/BUILD b/presence/fpp/BUILD index 2f12acb7..5aa6744a 100644 --- a/presence/fpp/BUILD +++ b/presence/fpp/BUILD @@ -24,7 +24,7 @@ cc_library( "//presence:__subpackages__", ], deps = [ - "//internal/platform:logging", + "//internal/platform:types", "//presence:types", "//presence/fpp/fpp_c_ffi", "//presence/implementation:sensor_fusion", diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD index 6f142289..febab2ed 100644 --- a/presence/implementation/BUILD +++ b/presence/implementation/BUILD @@ -87,7 +87,6 @@ cc_library( "//internal/crypto_cros", "//internal/platform:base", "//internal/platform:comm", - "//internal/platform:logging", "//internal/platform:types", "//internal/platform:uuid", "//internal/platform/implementation:comm",