Delete OverrideLog and cleanup includes (1/2)
Test: manual; unit tests
Change-Id: Ife876333f320df1c5d7ea1b91e694928fe68b2bc
diff --git a/src/nfc/llcp/llcp_api.cc b/src/nfc/llcp/llcp_api.cc
index f211958..289af2a 100644
--- a/src/nfc/llcp/llcp_api.cc
+++ b/src/nfc/llcp/llcp_api.cc
@@ -22,10 +22,17 @@
*
******************************************************************************/
-#include "llcp_api.h"
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "gki.h"
+#include "llcp_api.h"
#include "llcp_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
#if (LLCP_TEST_INCLUDED == TRUE) /* this is for LLCP testing */
tLLCP_TEST_PARAMS llcp_test_params = {
diff --git a/src/nfc/llcp/llcp_dlc.cc b/src/nfc/llcp/llcp_dlc.cc
index c4bc507..7f0ae4f 100644
--- a/src/nfc/llcp/llcp_dlc.cc
+++ b/src/nfc/llcp/llcp_dlc.cc
@@ -23,12 +23,18 @@
******************************************************************************/
#include <string>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "bt_types.h"
#include "gki.h"
#include "llcp_defs.h"
#include "llcp_int.h"
#include "nfc_int.h"
+using android::base::StringPrintf;
+
static tLLCP_STATUS llcp_dlsm_idle(tLLCP_DLCB* p_dlcb, tLLCP_DLC_EVENT event,
void* p_data);
static tLLCP_STATUS llcp_dlsm_w4_remote_resp(tLLCP_DLCB* p_dlcb,
@@ -41,11 +47,12 @@
tLLCP_DLC_EVENT event, void* p_data);
static tLLCP_STATUS llcp_dlsm_w4_remote_dm(tLLCP_DLCB* p_dlcb,
tLLCP_DLC_EVENT event);
-extern unsigned char appl_dta_mode_flag;
-
static std::string llcp_dlsm_get_state_name(tLLCP_DLC_STATE state);
static std::string llcp_dlsm_get_event_name(tLLCP_DLC_EVENT event);
+extern bool nfc_debug_enabled;
+extern unsigned char appl_dta_mode_flag;
+
/*******************************************************************************
**
** Function llcp_dlsm_execute
diff --git a/src/nfc/llcp/llcp_link.cc b/src/nfc/llcp/llcp_link.cc
index 37b9b4e..cebabba 100644
--- a/src/nfc/llcp/llcp_link.cc
+++ b/src/nfc/llcp/llcp_link.cc
@@ -23,6 +23,10 @@
******************************************************************************/
#include <string.h>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "bt_types.h"
#include "gki.h"
#include "llcp_defs.h"
@@ -31,6 +35,8 @@
#include "nfc_int.h"
#include "trace_api.h"
+using android::base::StringPrintf;
+
const uint16_t llcp_link_rwt
[15] = /* RWT = (302us)*2**WT; 302us = 256*16/fc; fc = 13.56MHz */
{
@@ -76,6 +82,7 @@
extern tLLCP_TEST_PARAMS llcp_test_params;
#endif
+extern bool nfc_debug_enabled;
extern unsigned char appl_dta_mode_flag;
/* debug functions type */
diff --git a/src/nfc/llcp/llcp_main.cc b/src/nfc/llcp/llcp_main.cc
index b470b76..1185e01 100644
--- a/src/nfc/llcp/llcp_main.cc
+++ b/src/nfc/llcp/llcp_main.cc
@@ -23,12 +23,20 @@
******************************************************************************/
#include <string.h>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "bt_types.h"
#include "gki.h"
#include "llcp_api.h"
#include "llcp_int.h"
#include "nfc_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
tLLCP_CB llcp_cb;
/*******************************************************************************
diff --git a/src/nfc/llcp/llcp_sdp.cc b/src/nfc/llcp/llcp_sdp.cc
index 4607330..affa4ff 100644
--- a/src/nfc/llcp/llcp_sdp.cc
+++ b/src/nfc/llcp/llcp_sdp.cc
@@ -23,12 +23,20 @@
******************************************************************************/
#include <string.h>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "bt_types.h"
#include "gki.h"
#include "llcp_api.h"
#include "llcp_int.h"
#include "nfa_dm_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
/*******************************************************************************
**
** Function llcp_sdp_proc_data
diff --git a/src/nfc/llcp/llcp_util.cc b/src/nfc/llcp/llcp_util.cc
index 753caa1..8b582d8 100644
--- a/src/nfc/llcp/llcp_util.cc
+++ b/src/nfc/llcp/llcp_util.cc
@@ -23,12 +23,20 @@
******************************************************************************/
#include <string.h>
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "bt_types.h"
#include "gki.h"
#include "llcp_defs.h"
#include "llcp_int.h"
#include "nfc_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
/*******************************************************************************
**
** Function llcp_util_parse_link_params
diff --git a/src/nfc/nci/nci_hrcv.cc b/src/nfc/nci/nci_hrcv.cc
index 35089cd..e42d04c 100644
--- a/src/nfc/nci/nci_hrcv.cc
+++ b/src/nfc/nci/nci_hrcv.cc
@@ -23,15 +23,23 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "gki.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "bt_types.h"
+#include "gki.h"
#include "nci_defs.h"
#include "nci_hmsgs.h"
#include "nfc_api.h"
#include "nfc_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
/*******************************************************************************
**
** Function nci_proc_core_rsp
diff --git a/src/nfc/nfc/nfc_ee.cc b/src/nfc/nfc/nfc_ee.cc
index 14f5c99..728cd55 100644
--- a/src/nfc/nfc/nfc_ee.cc
+++ b/src/nfc/nfc/nfc_ee.cc
@@ -22,13 +22,19 @@
*
******************************************************************************/
#include <string.h>
-#include "gki.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "gki.h"
#include "nci_hmsgs.h"
#include "nfc_api.h"
#include "nfc_int.h"
+using android::base::StringPrintf;
+
/*******************************************************************************
**
** Function NFC_NfceeDiscover
diff --git a/src/nfc/nfc/nfc_main.cc b/src/nfc/nfc/nfc_main.cc
index 4578e13..0fd4a04 100644
--- a/src/nfc/nfc/nfc_main.cc
+++ b/src/nfc/nfc/nfc_main.cc
@@ -24,11 +24,15 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "gki.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "bt_types.h"
#include "ce_int.h"
+#include "gki.h"
#include "nci_hmsgs.h"
#include "nfc_int.h"
#include "rw_int.h"
@@ -49,6 +53,11 @@
#define NFC_SET_MAX_CONN_DEFAULT()
#endif /* NFC_RW_ONLY */
+
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
/****************************************************************************
** Declarations
****************************************************************************/
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index f0af1f9..9b800c6 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -23,7 +23,10 @@
* (callback). On the transmit side, it manages the command transmission.
*
******************************************************************************/
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
#include <metricslogger/metrics_logger.h>
+
#include "nfc_target.h"
#include "include/debug_nfcsnoop.h"
@@ -33,6 +36,9 @@
#include "nfc_int.h"
#include "rw_api.h"
#include "rw_int.h"
+
+using android::base::StringPrintf;
+
#if (NFC_RW_ONLY == FALSE)
static const uint8_t nfc_mpl_code_to_size[] = {64, 128, 192, 254};
@@ -45,6 +51,8 @@
#define NFC_LB_ATTRIB_REQ_FIXED_BYTES 8
extern unsigned char appl_dta_mode_flag;
+extern bool nfc_debug_enabled;
+
/*******************************************************************************
**
** Function nfc_ncif_update_window
diff --git a/src/nfc/nfc/nfc_task.cc b/src/nfc/nfc/nfc_task.cc
index f9d2948..bf0a7a7 100644
--- a/src/nfc/nfc/nfc_task.cc
+++ b/src/nfc/nfc/nfc_task.cc
@@ -22,11 +22,15 @@
*
******************************************************************************/
#include <string.h>
-#include "bt_types.h"
-#include "gki.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "bt_types.h"
#include "ce_int.h"
+#include "gki.h"
#include "nci_hmsgs.h"
#include "nfc_int.h"
#include "rw_int.h"
@@ -38,6 +42,10 @@
#include "nfa_dm_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
/*******************************************************************************
**
** Function nfc_start_timer
diff --git a/src/nfc/nfc/nfc_utils.cc b/src/nfc/nfc/nfc_utils.cc
index 884d774..93fa7c6 100644
--- a/src/nfc/nfc/nfc_utils.cc
+++ b/src/nfc/nfc/nfc_utils.cc
@@ -23,11 +23,17 @@
* (callback). On the transmit side, it manages the command transmission.
*
******************************************************************************/
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "bt_types.h"
#include "nfc_api.h"
-
#include "nfc_int.h"
+using android::base::StringPrintf;
+
+extern bool nfc_debug_enabled;
+
/*******************************************************************************
**
** Function nfc_alloc_conn_cb
diff --git a/src/nfc/nfc/nfc_vs.cc b/src/nfc/nfc/nfc_vs.cc
index e82eff2..c23daf7 100644
--- a/src/nfc/nfc/nfc_vs.cc
+++ b/src/nfc/nfc/nfc_vs.cc
@@ -24,11 +24,17 @@
*
******************************************************************************/
#include <string.h>
-#include "gki.h"
+
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+
#include "nfc_target.h"
+#include "gki.h"
#include "nfc_int.h"
+using android::base::StringPrintf;
+
/****************************************************************************
** Declarations
****************************************************************************/
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 */