Delete OverrideLog and cleanup includes (1/2)
Test: manual; unit tests
Change-Id: Ife876333f320df1c5d7ea1b91e694928fe68b2bc
diff --git a/src/nfc/tags/ce_main.cc b/src/nfc/tags/ce_main.cc
index 95a8569..46e6955 100644
--- a/src/nfc/tags/ce_main.cc
+++ b/src/nfc/tags/ce_main.cc
@@ -24,12 +24,20 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "bt_types.h"
#include "ce_api.h"
#include "ce_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
tCE_CB ce_cb;
/*******************************************************************************
diff --git a/src/nfc/tags/ce_t3t.cc b/src/nfc/tags/ce_t3t.cc
index 2774ae5..461b9ed 100644
--- a/src/nfc/tags/ce_t3t.cc
+++ b/src/nfc/tags/ce_t3t.cc
@@ -23,12 +23,20 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "nfc_target.h"
-#include "trace_api.h"
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
+#include "nfc_target.h"
+
+#include "bt_types.h"
#include "ce_api.h"
#include "ce_int.h"
+#include "trace_api.h"
+
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
enum {
CE_T3T_COMMAND_INVALID,
diff --git a/src/nfc/tags/ce_t4t.cc b/src/nfc/tags/ce_t4t.cc
index 4d69834..64d2626 100644
--- a/src/nfc/tags/ce_t4t.cc
+++ b/src/nfc/tags/ce_t4t.cc
@@ -23,14 +23,22 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "nfc_target.h"
-#include "trace_api.h"
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
+#include "nfc_target.h"
+
+#include "bt_types.h"
#include "ce_api.h"
#include "ce_int.h"
#include "nfc_int.h"
#include "tags_int.h"
+#include "trace_api.h"
+
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
#if (CE_TEST_INCLUDED == TRUE) /* test only */
bool mapping_aid_test_enabled = false;
diff --git a/src/nfc/tags/rw_i93.cc b/src/nfc/tags/rw_i93.cc
index e5c5551..42a9c1c 100644
--- a/src/nfc/tags/rw_i93.cc
+++ b/src/nfc/tags/rw_i93.cc
@@ -23,14 +23,22 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "nfc_target.h"
-#include "trace_api.h"
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
+#include "nfc_target.h"
+
+#include "bt_types.h"
#include "nfc_api.h"
#include "nfc_int.h"
#include "rw_api.h"
#include "rw_int.h"
+#include "trace_api.h"
+
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
/* Response timeout */
#define RW_I93_TOUT_RESP 1000
diff --git a/src/nfc/tags/rw_main.cc b/src/nfc/tags/rw_main.cc
index 0eb5d8f..34dadae 100644
--- a/src/nfc/tags/rw_main.cc
+++ b/src/nfc/tags/rw_main.cc
@@ -24,15 +24,24 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "bt_types.h"
#include "nci_hmsgs.h"
#include "nfc_api.h"
#include "rw_api.h"
#include "rw_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
tRW_CB rw_cb;
+
/*******************************************************************************
*******************************************************************************/
void rw_init(void) {
diff --git a/src/nfc/tags/rw_t1t.cc b/src/nfc/tags/rw_t1t.cc
index 6ea307f..b7e8aa8 100644
--- a/src/nfc/tags/rw_t1t.cc
+++ b/src/nfc/tags/rw_t1t.cc
@@ -23,6 +23,10 @@
*
******************************************************************************/
#include <string>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
#include "gki.h"
@@ -32,7 +36,11 @@
#include "rw_api.h"
#include "rw_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
extern unsigned char appl_dta_mode_flag;
+
/* Local Functions */
static tRW_EVENT rw_t1t_handle_rid_rsp(NFC_HDR* p_pkt);
static void rw_t1t_data_cback(uint8_t conn_id, tNFC_CONN_EVT event,
diff --git a/src/nfc/tags/rw_t1t_ndef.cc b/src/nfc/tags/rw_t1t_ndef.cc
index 69e0c8a..9568327 100644
--- a/src/nfc/tags/rw_t1t_ndef.cc
+++ b/src/nfc/tags/rw_t1t_ndef.cc
@@ -23,6 +23,10 @@
*
******************************************************************************/
#include <string>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
#include "nci_hmsgs.h"
@@ -30,6 +34,10 @@
#include "rw_api.h"
#include "rw_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
#if (RW_NDEF_INCLUDED == TRUE)
/* Local Functions */
diff --git a/src/nfc/tags/rw_t2t.cc b/src/nfc/tags/rw_t2t.cc
index 2ea8241..a05c942 100644
--- a/src/nfc/tags/rw_t2t.cc
+++ b/src/nfc/tags/rw_t2t.cc
@@ -23,9 +23,13 @@
*
******************************************************************************/
#include <string>
-#include "bt_types.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "bt_types.h"
#include "gki.h"
#include "nci_hmsgs.h"
#include "nfc_api.h"
@@ -33,6 +37,10 @@
#include "rw_api.h"
#include "rw_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
/* Static local functions */
static void rw_t2t_proc_data(uint8_t conn_id, tNFC_DATA_CEVT* p_data);
static tNFC_STATUS rw_t2t_send_cmd(uint8_t opcode, uint8_t* p_dat);
diff --git a/src/nfc/tags/rw_t2t_ndef.cc b/src/nfc/tags/rw_t2t_ndef.cc
index a01db88..e8902a9 100644
--- a/src/nfc/tags/rw_t2t_ndef.cc
+++ b/src/nfc/tags/rw_t2t_ndef.cc
@@ -23,6 +23,10 @@
*
******************************************************************************/
#include <string.h>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
#include "nci_hmsgs.h"
@@ -30,6 +34,10 @@
#include "rw_api.h"
#include "rw_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
#if (RW_NDEF_INCLUDED == TRUE)
/* Local static functions */
diff --git a/src/nfc/tags/rw_t3t.cc b/src/nfc/tags/rw_t3t.cc
index c0ed5ff..e278900 100644
--- a/src/nfc/tags/rw_t3t.cc
+++ b/src/nfc/tags/rw_t3t.cc
@@ -23,15 +23,23 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "nfc_target.h"
-#include "trace_api.h"
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
+#include "nfc_target.h"
+
+#include "bt_types.h"
#include "nci_hmsgs.h"
#include "nfc_api.h"
#include "nfc_int.h"
#include "rw_api.h"
#include "rw_int.h"
+#include "trace_api.h"
+
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
/* Definitions for constructing t3t command messages */
#define RW_T3T_FL_PADDING 0x01 /* Padding needed for last NDEF block */
diff --git a/src/nfc/tags/rw_t4t.cc b/src/nfc/tags/rw_t4t.cc
index b5bfe8f..3256451 100644
--- a/src/nfc/tags/rw_t4t.cc
+++ b/src/nfc/tags/rw_t4t.cc
@@ -23,14 +23,22 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "nfc_target.h"
-#include "trace_api.h"
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
+#include "nfc_target.h"
+
+#include "bt_types.h"
#include "nfc_api.h"
#include "nfc_int.h"
#include "rw_api.h"
#include "rw_int.h"
+#include "trace_api.h"
+
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
/* main state */
/* T4T is not activated */