diff options
| author | 2017-01-12 16:01:35 +0000 | |
|---|---|---|
| committer | 2017-01-12 16:01:35 +0000 | |
| commit | a2c2d11f98b692401be56c8f285c570bae47ddda (patch) | |
| tree | 121324bd98cb08f03e3b101fbfc85693745a9427 /opengl | |
| parent | de3d159226fd695219f55e6724c6c308ac0b7b7b (diff) | |
| parent | fbc97581511f1fa6aba808a970afa912706fbdea (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: d655e61a22 am: 16a30c1ac8
am: fbc9758151
Change-Id: I911936217c6b47f48092319ff66edafaf0f7c395
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/egl.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/EGL/Loader.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 3 | ||||
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_tls.cpp | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 4e9cb5b6d2..493c0b8ec9 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -27,7 +27,7 @@ #include <sys/mman.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <utils/threads.h> #include <ui/ANativeObjectBase.h> diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index d6dcf67d32..218ab35696 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -23,8 +23,8 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <EGL/egl.h> diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 4245a92a3c..ee83ada26d 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -24,10 +24,9 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <android/log.h> #include <cutils/atomic.h> #include <cutils/properties.h> - +#include <log/log.h> #include <utils/CallStack.h> #include <utils/String8.h> diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index b3c6a882b2..a42b3f1cb0 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -27,11 +27,11 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <android/log.h> #include <cutils/atomic.h> #include <cutils/compiler.h> #include <cutils/memory.h> #include <cutils/properties.h> +#include <log/log.h> #include <gui/ISurfaceComposer.h> diff --git a/opengl/libs/EGL/egl_tls.cpp b/opengl/libs/EGL/egl_tls.cpp index 125700405f..6de5f27f4f 100644 --- a/opengl/libs/EGL/egl_tls.cpp +++ b/opengl/libs/EGL/egl_tls.cpp @@ -17,9 +17,8 @@ #include <pthread.h> #include <stdlib.h> -#include <android/log.h> #include <cutils/properties.h> - +#include <log/log.h> #include <utils/CallStack.h> #include <EGL/egl.h> |