diff options
author | 2016-12-28 17:11:38 +0000 | |
---|---|---|
committer | 2016-12-28 17:11:38 +0000 | |
commit | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (patch) | |
tree | 73123bf4e82507ca08ec638cba67c909a1535d1c /opengl/libagl/egl.cpp | |
parent | 20bfa17b2a4bfb76f54aeb9301296d0f19ad1f3c (diff) | |
parent | 430f62090cefe4630794873e30390433ad3e49a7 (diff) |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6 am: 7e92307cd8
am: 430f62090c
Change-Id: I8bbed9204718da324f0bdeceb7b8156cb315e900
Diffstat (limited to 'opengl/libagl/egl.cpp')
-rw-r--r-- | opengl/libagl/egl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index c1efd1cae6..bb20409819 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -18,16 +18,16 @@ #include <assert.h> #include <atomic> #include <errno.h> -#include <stdlib.h> +#include <fcntl.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <unistd.h> -#include <fcntl.h> #include <sys/ioctl.h> #include <sys/types.h> #include <sys/mman.h> +#include <unistd.h> -#include <cutils/log.h> +#include <android/log.h> #include <utils/threads.h> #include <ui/ANativeObjectBase.h> |