Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0a2a44b authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "fix circular dependency libnativewindow <-> libui"

parents d75ff5f2 3d7d5f99
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@
#include <GLES2/gl2.h>
#include <ui/Fence.h>
#include <ui/GraphicBuffer.h>
#include <gui/Surface.h>

namespace android {
namespace uirenderer {
+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@

#include "Readback.h"

#include <EGL/egl.h>
#include <EGL/eglext.h>

namespace android {
namespace uirenderer {

+1 −1
Original line number Diff line number Diff line
@@ -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