commit d88dfe8607af019186a309674d9081a056ed3daa
author Mark Salyzyn <salyzyn@google.com> Tue Apr 11 08:56:09 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Apr 11 10:50:06 2017 -0700
tree f25e5b360739e6791624fe5061e73e0d0d373c8e
parent f08d9dff190ffc1b479bede0b6037cfb1a9cb7fa

libhardware: deprecate cutils/log.h

Replace cutils/log.h with log/log.h. Sort headers. Minimize conflicts.
Add missing required headers.

Test: compile
Bug: 34250038
Change-Id: I5c0f231cbfed90b73e0538c9d32ad3226c7cc5e4

tests/camera2/CameraMetadataTests.cpp

diff --git a/tests/camera2/CameraMetadataTests.cpp b/tests/camera2/CameraMetadataTests.cpp
index da5b748..16b2dd9 100644
--- a/tests/camera2/CameraMetadataTests.cpp
+++ b/tests/camera2/CameraMetadataTests.cpp
@@ -16,8 +16,13 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "CameraMetadataTestFunctional"
-#include "cutils/log.h"
+
+#include <stdint.h>
+
+#include <string>
+
 #include "cutils/properties.h"
+#include "log/log.h"
 #include "utils/Errors.h"
 
 #include "gtest/gtest.h"
@@ -31,8 +36,6 @@
 #include <gui/CpuConsumer.h>
 #include <gui/Surface.h>
 
-#include <string>
-
 #include "CameraStreamFixture.h"
 #include "TestExtensions.h"