diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-04-11 08:56:09 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-04-11 10:50:06 -0700 |
| commit | d88dfe8607af019186a309674d9081a056ed3daa (patch) | |
| tree | f25e5b360739e6791624fe5061e73e0d0d373c8e /modules/gralloc/framebuffer.cpp | |
| parent | f08d9dff190ffc1b479bede0b6037cfb1a9cb7fa (diff) | |
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
Diffstat (limited to 'modules/gralloc/framebuffer.cpp')
| -rw-r--r-- | modules/gralloc/framebuffer.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp index eadcdaa6..7ef8098d 100644 --- a/modules/gralloc/framebuffer.cpp +++ b/modules/gralloc/framebuffer.cpp @@ -14,24 +14,20 @@ * limitations under the License. */ -#include <sys/mman.h> - #include <dlfcn.h> - -#include <cutils/ashmem.h> -#include <cutils/log.h> - -#include <hardware/hardware.h> -#include <hardware/gralloc.h> - -#include <fcntl.h> #include <errno.h> -#include <sys/ioctl.h> -#include <string.h> +#include <fcntl.h> #include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> -#include <cutils/log.h> +#include <cutils/ashmem.h> #include <cutils/atomic.h> +#include <log/log.h> + +#include <hardware/gralloc.h> +#include <hardware/hardware.h> #ifdef __ANDROID__ #include <linux/fb.h> |