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/metadata/control.h

diff --git a/modules/camera/3_4/metadata/control.h b/modules/camera/3_4/metadata/control.h
index ad3f87b..902a60c 100644
--- a/modules/camera/3_4/metadata/control.h
+++ b/modules/camera/3_4/metadata/control.h
@@ -19,9 +19,9 @@
 
 #include <vector>
 
+#include <android-base/macros.h>
 #include <system/camera_metadata.h>
 
-#include "../common.h"
 #include "metadata_common.h"
 #include "partial_metadata_interface.h"
 #include "tagged_control_delegate.h"