nfc: removed libstatspull & libstatslog dependency am: 31aa7e67d0 am: cf29576507 am: 4c0e0b8bac
Original change: https://android-review.googlesource.com/c/platform/system/nfc/+/2225542
Change-Id: If3acd00a313092fef9c1cd50f73eb9af78262483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/Android.bp b/src/Android.bp
index cd1b265..af3ac8d 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -21,7 +21,7 @@
"libz",
"libchrome",
"libbase",
- "libstatslog",
+ "libstatslog_nfc",
// Treble configuration
"libhidlbase",
@@ -133,6 +133,50 @@
},
}
+cc_library {
+ name: "libstatslog_nfc",
+ host_supported: true,
+ generated_sources: ["statslog_nfc.cpp"],
+ generated_headers: ["statslog_nfc.h"],
+ export_generated_headers: ["statslog_nfc.h"],
+ shared_libs: [
+ "libcutils",
+ ],
+ target: {
+ android: {
+ shared_libs: [
+ "libstatssocket",
+ ],
+ },
+ host: {
+ static_libs: [
+ "libstatssocket",
+ ],
+ },
+ darwin: {
+ enabled: false,
+ },
+ },
+}
+
+genrule {
+ name: "statslog_nfc.h",
+ tools: ["stats-log-api-gen"],
+ cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_nfc.h --module nfc --namespace nfc,stats",
+ out: [
+ "statslog_nfc.h",
+ ],
+}
+
+genrule {
+ name: "statslog_nfc.cpp",
+ tools: ["stats-log-api-gen"],
+ cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_nfc.cpp --module nfc --namespace nfc,stats --importHeader statslog_nfc.h",
+ out: [
+ "statslog_nfc.cpp",
+ ],
+}
+
cc_fuzz {
name: "nfc_nci_fuzzer",
defaults: ["nfc_fuzzer_defaults"],
@@ -148,6 +192,9 @@
"fuzzers/*.cc",
"fuzzers/nci/*.cc",
],
+ shared_libs: [
+ "libstatslog_nfc",
+ ]
}
cc_fuzz {
@@ -264,6 +311,7 @@
],
shared_libs: [
"libprotobuf-cpp-full",
+ "libstatslog_nfc",
"libz",
]
}
diff --git a/src/nfa/ee/nfa_ee_act.cc b/src/nfa/ee/nfa_ee_act.cc
index 0999eaa..6899a56 100644
--- a/src/nfa/ee/nfa_ee_act.cc
+++ b/src/nfa/ee/nfa_ee_act.cc
@@ -23,7 +23,7 @@
******************************************************************************/
#include <android-base/stringprintf.h>
#include <base/logging.h>
-#include <statslog.h>
+#include <statslog_nfc.h>
#include <string.h>
#include "include/debug_lmrt.h"
@@ -1251,8 +1251,8 @@
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"status:%d ee_cfged:0x%02x ", evt_data.status, nfa_ee_cb.ee_cfged);
if (evt_data.status == NFA_STATUS_BUFFER_FULL)
- android::util::stats_write(android::util::NFC_ERROR_OCCURRED,
- (int32_t)AID_OVERFLOW, 0, 0);
+ nfc::stats::stats_write(nfc::stats::NFC_ERROR_OCCURRED,
+ (int32_t)AID_OVERFLOW, 0, 0);
/* report the status of this operation */
nfa_ee_report_event(p_cb->p_ee_cback, NFA_EE_ADD_AID_EVT, &evt_data);
}
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 32b3f02..4cae7fb 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -27,21 +27,20 @@
#include <base/logging.h>
#include <fcntl.h>
#include <log/log.h>
+#include <statslog_nfc.h>
#include <sys/stat.h>
-
-#include "nfc_target.h"
+#include <sys/time.h>
#include "include/debug_nfcsnoop.h"
+#include "metrics.h"
#include "nci_defs.h"
#include "nci_hmsgs.h"
#include "nfc_api.h"
#include "nfc_int.h"
+#include "nfc_target.h"
#include "rw_api.h"
#include "rw_int.h"
-#include <statslog.h>
-#include "metrics.h"
-
using android::base::StringPrintf;
#if (NFC_RW_ONLY == FALSE)
@@ -244,8 +243,8 @@
(timer_end.tv_usec - timer_start.tv_usec) / 1000;
memset(&timer_start, 0, sizeof(timer_start));
memset(&timer_end, 0, sizeof(timer_end));
- android::util::stats_write(android::util::NFC_HCE_TRANSACTION_OCCURRED,
- (int32_t)delta_time_ms);
+ nfc::stats::stats_write(nfc::stats::NFC_HCE_TRANSACTION_OCCURRED,
+ (int32_t)delta_time_ms);
}
return (NCI_STATUS_OK);
}
@@ -567,9 +566,9 @@
tNFC_RESPONSE evt_data;
if (event == NFC_NFCC_TIMEOUT_REVT && status == NFC_STATUS_HW_TIMEOUT) {
uint32_t cmd_hdr = (nfc_cb.last_hdr[0] << 8) | nfc_cb.last_hdr[1];
- android::util::stats_write(android::util::NFC_ERROR_OCCURRED,
- (int32_t)NCI_TIMEOUT, (int32_t)cmd_hdr,
- (int32_t)status);
+ nfc::stats::stats_write(nfc::stats::NFC_ERROR_OCCURRED,
+ (int32_t)NCI_TIMEOUT, (int32_t)cmd_hdr,
+ (int32_t)status);
}
if (nfc_cb.p_resp_cback) {
evt_data.status = (tNFC_STATUS)status;
@@ -594,8 +593,8 @@
nfc_conn.status = status;
(*p_cb->p_cback)(conn_id, NFC_ERROR_CEVT, &nfc_conn);
}
- android::util::stats_write(android::util::NFC_ERROR_OCCURRED,
- (int32_t)ERROR_NTF, (int32_t)0, (int32_t)status);
+ nfc::stats::stats_write(nfc::stats::NFC_ERROR_OCCURRED, (int32_t)ERROR_NTF,
+ (int32_t)0, (int32_t)status);
}
/*******************************************************************************
