Merge "QCamera2: Adds ability to disable debug logs at build time"
diff --git a/QCamera2/HAL/Android.mk b/QCamera2/HAL/Android.mk
index 7331a67..509ae41 100644
--- a/QCamera2/HAL/Android.mk
+++ b/QCamera2/HAL/Android.mk
@@ -18,6 +18,8 @@
QCameraThermalAdapter.cpp
LOCAL_CFLAGS = -Wall -Werror
+#Debug logs are enabled
+#LOCAL_CFLAGS += -DDISABLE_DEBUG_LOG
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../stack/common \
diff --git a/QCamera2/HAL/QCamera2Factory.cpp b/QCamera2/HAL/QCamera2Factory.cpp
index a135956..4408cce 100644
--- a/QCamera2/HAL/QCamera2Factory.cpp
+++ b/QCamera2/HAL/QCamera2Factory.cpp
@@ -31,7 +31,6 @@
#define LOG_TAG "QCamera2Factory"
#include <stdlib.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
#include <hardware/camera.h>
diff --git a/QCamera2/HAL/QCamera2HWI.cpp b/QCamera2/HAL/QCamera2HWI.cpp
index 80f2a6f..26eedd3 100644
--- a/QCamera2/HAL/QCamera2HWI.cpp
+++ b/QCamera2/HAL/QCamera2HWI.cpp
@@ -32,7 +32,6 @@
#include <cutils/properties.h>
#include <hardware/camera.h>
#include <stdlib.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
#include <gralloc_priv.h>
diff --git a/QCamera2/HAL/QCamera2HWI.h b/QCamera2/HAL/QCamera2HWI.h
index d477af7..df6b653 100644
--- a/QCamera2/HAL/QCamera2HWI.h
+++ b/QCamera2/HAL/QCamera2HWI.h
@@ -32,6 +32,7 @@
#include <hardware/camera.h>
#include <hardware/power.h>
+#include <utils/Log.h>
#include <QCameraParameters.h>
#include "QCameraQueue.h"
@@ -48,6 +49,22 @@
#include <mm_jpeg_interface.h>
}
+#if DISABLE_DEBUG_LOG
+
+inline void __null_log(int, const char *, const char *, ...) {}
+
+#ifdef ALOGD
+#undef ALOGD
+#define ALOGD(...) do { __null_log(0, LOG_TAG,__VA_ARGS__); } while (0)
+#endif
+
+#ifdef ALOGI
+#undef ALOGI
+#define ALOGI(...) do { __null_log(0, LOG_TAG,__VA_ARGS__); } while (0)
+#endif
+
+#endif
+
namespace qcamera {
#ifndef TRUE
diff --git a/QCamera2/HAL/QCamera2HWICallbacks.cpp b/QCamera2/HAL/QCamera2HWICallbacks.cpp
index 918150b..aba232a 100644
--- a/QCamera2/HAL/QCamera2HWICallbacks.cpp
+++ b/QCamera2/HAL/QCamera2HWICallbacks.cpp
@@ -30,7 +30,6 @@
#define LOG_TAG "QCamera2HWI"
#include <fcntl.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
#include <utils/Timers.h>
#include "QCamera2HWI.h"
diff --git a/QCamera2/HAL/QCameraChannel.cpp b/QCamera2/HAL/QCameraChannel.cpp
index 2e3476e..23a6a49 100644
--- a/QCamera2/HAL/QCameraChannel.cpp
+++ b/QCamera2/HAL/QCameraChannel.cpp
@@ -29,9 +29,9 @@
#define LOG_TAG "QCameraChannel"
-#include <utils/Log.h>
#include <utils/Errors.h>
#include "QCameraParameters.h"
+#include "QCamera2HWI.h"
#include "QCameraChannel.h"
using namespace android;
diff --git a/QCamera2/HAL/QCameraCmdThread.cpp b/QCamera2/HAL/QCameraCmdThread.cpp
index 16358fb..7504f43 100644
--- a/QCamera2/HAL/QCameraCmdThread.cpp
+++ b/QCamera2/HAL/QCameraCmdThread.cpp
@@ -27,9 +27,9 @@
*
*/
-#include <utils/Log.h>
#include <utils/Errors.h>
#include "QCameraCmdThread.h"
+#include "QCamera2HWI.h"
using namespace android;
diff --git a/QCamera2/HAL/QCameraMem.cpp b/QCamera2/HAL/QCameraMem.cpp
index a77258e..03da59f 100644
--- a/QCamera2/HAL/QCameraMem.cpp
+++ b/QCamera2/HAL/QCameraMem.cpp
@@ -32,10 +32,10 @@
#include <string.h>
#include <fcntl.h>
#include <sys/mman.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
#include <gralloc_priv.h>
#include <QComOMXMetadata.h>
+#include "QCamera2HWI.h"
#include "QCameraMem.h"
extern "C" {
diff --git a/QCamera2/HAL/QCameraParameters.cpp b/QCamera2/HAL/QCameraParameters.cpp
index 0040fe2..1dbab44 100644
--- a/QCamera2/HAL/QCameraParameters.cpp
+++ b/QCamera2/HAL/QCameraParameters.cpp
@@ -31,11 +31,11 @@
#include <cutils/properties.h>
#include <math.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
#include <string.h>
#include <stdlib.h>
#include <gralloc_priv.h>
+#include "QCamera2HWI.h"
#include "QCameraParameters.h"
#define ASPECT_TOLERANCE 0.001
diff --git a/QCamera2/HAL/QCameraParameters.h b/QCamera2/HAL/QCameraParameters.h
index 839f864..163209d 100644
--- a/QCamera2/HAL/QCameraParameters.h
+++ b/QCamera2/HAL/QCameraParameters.h
@@ -24,7 +24,6 @@
#include <cutils/properties.h>
#include <hardware/camera.h>
#include <stdlib.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
#include "cam_intf.h"
#include "QCameraMem.h"
diff --git a/QCamera2/HAL/QCameraPostProc.cpp b/QCamera2/HAL/QCameraPostProc.cpp
index 93a85ef..deca968 100644
--- a/QCamera2/HAL/QCameraPostProc.cpp
+++ b/QCamera2/HAL/QCameraPostProc.cpp
@@ -30,7 +30,6 @@
#define LOG_TAG "QCameraPostProc"
#include <stdlib.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
#include "QCamera2HWI.h"
diff --git a/QCamera2/HAL/QCameraQueue.cpp b/QCamera2/HAL/QCameraQueue.cpp
index 51da4df..957ab06 100644
--- a/QCamera2/HAL/QCameraQueue.cpp
+++ b/QCamera2/HAL/QCameraQueue.cpp
@@ -27,8 +27,8 @@
*
*/
-#include <utils/Log.h>
#include <utils/Errors.h>
+#include "QCamera2HWI.h"
#include "QCameraQueue.h"
namespace qcamera {
diff --git a/QCamera2/HAL/QCameraStateMachine.cpp b/QCamera2/HAL/QCameraStateMachine.cpp
index ef87d44..00a58b9 100644
--- a/QCamera2/HAL/QCameraStateMachine.cpp
+++ b/QCamera2/HAL/QCameraStateMachine.cpp
@@ -29,7 +29,6 @@
#define LOG_TAG "QCameraStateMachine"
-#include <utils/Log.h>
#include <utils/Errors.h>
#include "QCamera2HWI.h"
#include "QCameraStateMachine.h"
diff --git a/QCamera2/HAL/QCameraStream.cpp b/QCamera2/HAL/QCameraStream.cpp
index 76c0e64..9ca6d2c 100644
--- a/QCamera2/HAL/QCameraStream.cpp
+++ b/QCamera2/HAL/QCameraStream.cpp
@@ -29,7 +29,6 @@
#define LOG_TAG "QCameraStream"
-#include <utils/Log.h>
#include <utils/Errors.h>
#include "QCamera2HWI.h"
#include "QCameraStream.h"
diff --git a/QCamera2/HAL/QCameraThermalAdapter.cpp b/QCamera2/HAL/QCameraThermalAdapter.cpp
index 512f2e9..16d8a42 100644
--- a/QCamera2/HAL/QCameraThermalAdapter.cpp
+++ b/QCamera2/HAL/QCameraThermalAdapter.cpp
@@ -31,9 +31,9 @@
#include <dlfcn.h>
#include <stdlib.h>
-#include <utils/Log.h>
#include <utils/Errors.h>
+#include "QCamera2HWI.h"
#include "QCameraThermalAdapter.h"
using namespace android;