liblog: use log/log.h to access main logging macros
Test: compile
Bug: 30465923
Change-Id: I164793caf5305c6c6317f7c21f47cd102a25b036
diff --git a/NfcNci/nci/jni/CondVar.cpp b/NfcNci/nci/jni/CondVar.cpp
index 02a81ab..29372c3 100644
--- a/NfcNci/nci/jni/CondVar.cpp
+++ b/NfcNci/nci/jni/CondVar.cpp
@@ -24,7 +24,7 @@
#include <errno.h>
#include <string.h>
-#include <android/log.h>
+#include <log/log.h>
/*******************************************************************************
**
diff --git a/NfcNci/nci/jni/DataQueue.cpp b/NfcNci/nci/jni/DataQueue.cpp
index adee851..c86c36d 100644
--- a/NfcNci/nci/jni/DataQueue.cpp
+++ b/NfcNci/nci/jni/DataQueue.cpp
@@ -23,7 +23,7 @@
#include <malloc.h>
#include <string.h>
-#include <android/log.h>
+#include <log/log.h>
/*******************************************************************************
**
diff --git a/NfcNci/nci/jni/Mutex.cpp b/NfcNci/nci/jni/Mutex.cpp
index 003887b..22c1f00 100644
--- a/NfcNci/nci/jni/Mutex.cpp
+++ b/NfcNci/nci/jni/Mutex.cpp
@@ -24,7 +24,7 @@
#include <errno.h>
#include <string.h>
-#include <android/log.h>
+#include <log/log.h>
/*******************************************************************************
**
diff --git a/NfcNci/nci/jni/NfcJniUtil.cpp b/NfcNci/nci/jni/NfcJniUtil.cpp
index bda6471..2c75593 100755
--- a/NfcNci/nci/jni/NfcJniUtil.cpp
+++ b/NfcNci/nci/jni/NfcJniUtil.cpp
@@ -18,7 +18,7 @@
#include <errno.h>
-#include <android/log.h>
+#include <log/log.h>
#include <JNIHelp.h>
#include <ScopedLocalRef.h>
diff --git a/NfcNci/nci/jni/RoutingManager.cpp b/NfcNci/nci/jni/RoutingManager.cpp
index 7382218..d2f6964 100755
--- a/NfcNci/nci/jni/RoutingManager.cpp
+++ b/NfcNci/nci/jni/RoutingManager.cpp
@@ -18,7 +18,8 @@
* Manage the listen-mode routing table.
*/
-#include <android/log.h>
+#include <log/log.h>
+
#include <ScopedLocalRef.h>
#include <JNIHelp.h>
#include "config.h"
diff --git a/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.c b/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.c
index 9a6ec59..c45a12a 100755
--- a/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.c
+++ b/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.c
@@ -22,6 +22,7 @@
# include "phNxpConfig.h"
#endif
#include <cutils/properties.h>
+#include <log/log.h>
const char * NXPLOG_ITEM_EXTNS = "NxpExtns";
const char * NXPLOG_ITEM_NCIHAL = "NxpHal";
diff --git a/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.h b/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.h
index e189de1..ec09066 100755
--- a/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.h
+++ b/NfcNci/nci/jni/extns/pn54x/src/log/phNxpLog.h
@@ -17,7 +17,7 @@
#if !defined (NXPLOG__H_INCLUDED)
#define NXPLOG__H_INCLUDED
-#include <android/log.h>
+#include <log/log.h>
typedef struct nci_log_level
{
diff --git a/NfcNci/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c b/NfcNci/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c
index b1f105d..81318cb 100755
--- a/NfcNci/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c
+++ b/NfcNci/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.c
@@ -15,6 +15,8 @@
*/
#define LOG_TAG "pn54x"
+#include <log/log.h>
+
#include <nfc_api.h>
#include <rw_api.h>
#include <phNfcCompId.h>
diff --git a/NfcNci/nci/jni/extns/pn54x/src/phNxpExtns.c b/NfcNci/nci/jni/extns/pn54x/src/phNxpExtns.c
index f94c2e6..9094e24 100755
--- a/NfcNci/nci/jni/extns/pn54x/src/phNxpExtns.c
+++ b/NfcNci/nci/jni/extns/pn54x/src/phNxpExtns.c
@@ -22,6 +22,8 @@
#include <sys/ioctl.h>
#include <sys/time.h>
+#include <log/log.h>
+
#include <phNxpExtns_MifareStd.h>
#include <phNxpLog.h>
#include <phNxpConfig.h>
