commit 2ad591f9ea58c9810c9904e15e3e98af84e3c6c6
author Sergii Piatakov <sergii.piatakov@globallogic.com> Fri Aug 03 11:41:06 2018 +0300
committer Sergii Piatakov <sergii.piatakov@globallogic.com> Fri Aug 10 14:16:05 2018 +0300
tree 63f12914a31172a9a454678b4841802625223795
parent 06939479d62c19f41dd629dabebcab8acac98028

camera: fix `-Wmacro-redefined` compiler warnings

Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: Ida00d842007e2a589907bc4fd1887076fd8b5b2a
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>

modules/camera/3_4/camera.cpp

diff --git a/modules/camera/3_4/camera.cpp b/modules/camera/3_4/camera.cpp
index 79dca0b..01236f3 100644
--- a/modules/camera/3_4/camera.cpp
+++ b/modules/camera/3_4/camera.cpp
@@ -16,6 +16,9 @@
 
 // Modified from hardware/libhardware/modules/camera/Camera.cpp
 
+//#define LOG_NDEBUG 0
+#define LOG_TAG "Camera"
+
 #include <cstdlib>
 #include <memory>
 #include <vector>
@@ -28,8 +31,6 @@
 
 #include "metadata/metadata_common.h"
 
-//#define LOG_NDEBUG 0
-#define LOG_TAG "Camera"
 #include <cutils/log.h>
 
 #define ATRACE_TAG (ATRACE_TAG_CAMERA | ATRACE_TAG_HAL)