From 05685dda5b3bafb7b56f19ee953708fdbf81d661 Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Tue, 3 Sep 2024 17:12:21 -0700 Subject: [PATCH] Update copybara rule to ban direct use of absl/log in entire repo. PiperOrigin-RevId: 670757551 --- connections/implementation/reconnect_manager.cc | 9 ++------- internal/platform/borrowable.h | 7 ------- .../platform/implementation/windows/ble_gatt_server.cc | 1 - .../implementation/windows/ble_v2_server_socket.cc | 1 - .../platform/implementation/windows/bluetooth_pairing.cc | 1 - 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/connections/implementation/reconnect_manager.cc b/connections/implementation/reconnect_manager.cc index f5e6b6cc..0094178a 100644 --- a/connections/implementation/reconnect_manager.cc +++ b/connections/implementation/reconnect_manager.cc @@ -22,13 +22,6 @@ #include "securegcm/ukey2_handshake.h" #include "absl/functional/any_invocable.h" #include "absl/functional/bind_front.h" -#include "internal/platform/mutex.h" -#include "internal/platform/mutex_lock.h" -#ifndef NEARBY_CHROMIUM -#ifndef NEARBY_SWIFTPM -#include "absl/log/check.h" // nogncheck -#endif -#endif #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "connections/implementation/bluetooth_endpoint_channel.h" @@ -49,6 +42,8 @@ #include "internal/platform/feature_flags.h" #include "internal/platform/implementation/system_clock.h" #include "internal/platform/logging.h" +#include "internal/platform/mutex.h" +#include "internal/platform/mutex_lock.h" #include "proto/connections_enums.pb.h" namespace nearby { diff --git a/internal/platform/borrowable.h b/internal/platform/borrowable.h index 93fa73c7..f9a07401 100644 --- a/internal/platform/borrowable.h +++ b/internal/platform/borrowable.h @@ -37,14 +37,7 @@ #include #include -#ifdef NEARBY_CHROMIUM -#include "base/check.h" -#elif defined(NEARBY_SWIFTPM) #include "internal/platform/logging.h" -#else -#include "absl/log/check.h" // nogncheck -#endif - #include "internal/platform/mutex.h" #include "internal/platform/mutex_lock.h" diff --git a/internal/platform/implementation/windows/ble_gatt_server.cc b/internal/platform/implementation/windows/ble_gatt_server.cc index 0d0dc1ec..bc48ac1a 100644 --- a/internal/platform/implementation/windows/ble_gatt_server.cc +++ b/internal/platform/implementation/windows/ble_gatt_server.cc @@ -27,7 +27,6 @@ #include "absl/container/flat_hash_map.h" #include "absl/functional/any_invocable.h" -#include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/escaping.h" #include "absl/strings/str_format.h" diff --git a/internal/platform/implementation/windows/ble_v2_server_socket.cc b/internal/platform/implementation/windows/ble_v2_server_socket.cc index 0be7bd7f..6b60857c 100644 --- a/internal/platform/implementation/windows/ble_v2_server_socket.cc +++ b/internal/platform/implementation/windows/ble_v2_server_socket.cc @@ -18,7 +18,6 @@ #include #include -#include "absl/log/check.h" #include "absl/synchronization/mutex.h" #include "absl/synchronization/notification.h" #include "internal/platform/exception.h" diff --git a/internal/platform/implementation/windows/bluetooth_pairing.cc b/internal/platform/implementation/windows/bluetooth_pairing.cc index 10657d0e..f8a2cd56 100644 --- a/internal/platform/implementation/windows/bluetooth_pairing.cc +++ b/internal/platform/implementation/windows/bluetooth_pairing.cc @@ -21,7 +21,6 @@ #include #include -#include "absl/log/check.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "internal/platform/implementation/bluetooth_classic.h"