commit 9007c70afa302d4dcc0fd5166b0250540583e017
author John Stultz <john.stultz@linaro.org> Thu Jun 21 16:50:36 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 21 16:50:36 2018 -0700
tree 1181b9047d48dc3b8f5341879c5c5a794bb11dab
parent 6b4ed155c57ccef030df53d0613cf5de6a4e7a73
parent da55c5fd2ae87b39116ba2b3235f9749fcde6492

Merge "hikey960: gralloc960: Fix log.h include to avoid warnings" am: d4414cf278
am: da55c5fd2a

Change-Id: Ia0ef3447825b95230854b9f3f9472c1bd4431acc

gralloc960/framebuffer_device.cpp

diff --git a/gralloc960/framebuffer_device.cpp b/gralloc960/framebuffer_device.cpp
index 44c4695..a45d0c3 100644
--- a/gralloc960/framebuffer_device.cpp
+++ b/gralloc960/framebuffer_device.cpp
@@ -23,7 +23,7 @@
 #include <sys/ioctl.h>
 #include <linux/fb.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 #include <hardware/hardware.h>
 #include <hardware/fb.h>

gralloc960/gralloc_buffer_priv.cpp

diff --git a/gralloc960/gralloc_buffer_priv.cpp b/gralloc960/gralloc_buffer_priv.cpp
index 274dec2..30b49ce 100644
--- a/gralloc960/gralloc_buffer_priv.cpp
+++ b/gralloc960/gralloc_buffer_priv.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <cutils/ashmem.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <sys/mman.h>
 
 #if GRALLOC_USE_GRALLOC1_API == 1

gralloc960/mali_gralloc_formats.cpp

diff --git a/gralloc960/mali_gralloc_formats.cpp b/gralloc960/mali_gralloc_formats.cpp
index a62898c..32272d7 100644
--- a/gralloc960/mali_gralloc_formats.cpp
+++ b/gralloc960/mali_gralloc_formats.cpp
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <dlfcn.h>
 #include <inttypes.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #if GRALLOC_USE_GRALLOC1_API == 1
 #include <hardware/gralloc1.h>

gralloc960/mali_gralloc_module.cpp

diff --git a/gralloc960/mali_gralloc_module.cpp b/gralloc960/mali_gralloc_module.cpp
index eea6bdb..3956351 100644
--- a/gralloc960/mali_gralloc_module.cpp
+++ b/gralloc960/mali_gralloc_module.cpp
@@ -20,7 +20,7 @@
 #include <pthread.h>
 #include <inttypes.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 #include <hardware/hardware.h>
 #include <hardware/fb.h>