diff options
| author | 2017-05-01 15:13:20 -0700 | |
|---|---|---|
| committer | 2017-05-09 16:40:50 -0700 | |
| commit | 3d7d5f999f636106e6c9d47bddfed4ec8baded35 (patch) | |
| tree | a22ea8c0d382e87e19e64bc2f99ffa32d1377705 | |
| parent | 38039d8716b9d84c42502441c1eca483184f79e2 (diff) | |
fix circular dependency libnativewindow <-> libui
Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I00d72d063c252739ca5a63dbf84424ad4f837f89
| -rw-r--r-- | libs/hwui/OpenGLReadback.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/OpenGLReadback.h | 3 | ||||
| -rw-r--r-- | libs/hwui/Readback.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLReadback.cpp b/libs/hwui/OpenGLReadback.cpp index d64804e480f5..4ef0f4bd2712 100644 --- a/libs/hwui/OpenGLReadback.cpp +++ b/libs/hwui/OpenGLReadback.cpp @@ -27,6 +27,7 @@ #include <GLES2/gl2.h> #include <ui/Fence.h> #include <ui/GraphicBuffer.h> +#include <gui/Surface.h> namespace android { namespace uirenderer { diff --git a/libs/hwui/OpenGLReadback.h b/libs/hwui/OpenGLReadback.h index c9222cff51da..403f2e34d515 100644 --- a/libs/hwui/OpenGLReadback.h +++ b/libs/hwui/OpenGLReadback.h @@ -18,6 +18,9 @@ #include "Readback.h" +#include <EGL/egl.h> +#include <EGL/eglext.h> + namespace android { namespace uirenderer { diff --git a/libs/hwui/Readback.h b/libs/hwui/Readback.h index b76395301a21..7cf426228af6 100644 --- a/libs/hwui/Readback.h +++ b/libs/hwui/Readback.h @@ -20,10 +20,10 @@ #include "Rect.h" #include <SkBitmap.h> -#include <gui/Surface.h> namespace android { class GraphicBuffer; +class Surface; namespace uirenderer { // Keep in sync with PixelCopy.java codes |