commit d4414cf278b807592cda035172b056ee0354e3ee
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 21 23:35:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 21 23:35:32 2018 +0000
tree 7a979138296fdd89f1551aa907dbb67fbc5be75f
parent f12cce5c9a289b51d2d632b9b711fca7b28271dc
parent c7e94d8c6fd36f7fe90e011a265dbf939444bd09

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

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>