diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-21 23:35:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-21 23:35:32 +0000 |
| commit | d4414cf278b807592cda035172b056ee0354e3ee (patch) | |
| tree | 7a979138296fdd89f1551aa907dbb67fbc5be75f | |
| parent | f12cce5c9a289b51d2d632b9b711fca7b28271dc (diff) | |
| parent | c7e94d8c6fd36f7fe90e011a265dbf939444bd09 (diff) | |
| download | hikey-d4414cf278b807592cda035172b056ee0354e3ee.tar.gz | |
Merge "hikey960: gralloc960: Fix log.h include to avoid warnings"
| -rw-r--r-- | gralloc960/framebuffer_device.cpp | 2 | ||||
| -rw-r--r-- | gralloc960/gralloc_buffer_priv.cpp | 2 | ||||
| -rw-r--r-- | gralloc960/mali_gralloc_formats.cpp | 2 | ||||
| -rw-r--r-- | gralloc960/mali_gralloc_module.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gralloc960/framebuffer_device.cpp b/gralloc960/framebuffer_device.cpp index 44c46954..a45d0c37 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> diff --git a/gralloc960/gralloc_buffer_priv.cpp b/gralloc960/gralloc_buffer_priv.cpp index 274dec2e..30b49ce3 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 diff --git a/gralloc960/mali_gralloc_formats.cpp b/gralloc960/mali_gralloc_formats.cpp index a62898c7..32272d73 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> diff --git a/gralloc960/mali_gralloc_module.cpp b/gralloc960/mali_gralloc_module.cpp index eea6bdb8..39563518 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> |