diff options
| author | John Stultz <john.stultz@linaro.org> | 2018-06-21 16:46:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-21 16:46:08 -0700 |
| commit | da55c5fd2ae87b39116ba2b3235f9749fcde6492 (patch) | |
| tree | 1181b9047d48dc3b8f5341879c5c5a794bb11dab | |
| parent | a73ce0afbf4e1681ed2d47fe1913a9d297d06777 (diff) | |
| parent | d4414cf278b807592cda035172b056ee0354e3ee (diff) | |
| download | hikey-da55c5fd2ae87b39116ba2b3235f9749fcde6492.tar.gz | |
Merge "hikey960: gralloc960: Fix log.h include to avoid warnings"
am: d4414cf278
Change-Id: Ib0b110fd5cf07b6693213fce8a45bc7be62d71cf
| -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> |