diff options
| author | Mathias Agopian <mathias@google.com> | 2017-04-27 20:06:55 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-05-09 16:42:31 -0700 |
| commit | 6a3c05bcfab588fd99dd8d619a53d15374e99507 (patch) | |
| tree | 30e5edaa74ea3dff07579a5a9cd39f1755069eb3 /opengl | |
| parent | 37c27efdf8232272648e56513f3caceeb5c66407 (diff) | |
| download | native-6a3c05bcfab588fd99dd8d619a53d15374e99507.tar.gz | |
fix circular dependency libnativewindow <-> libui
Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: I9631beea52e23ebb519411f943c6f5062aedd2e5
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/libagl/egl.cpp | 18 | ||||
| -rw-r--r-- | opengl/tests/hwc/Android.bp | 5 |
3 files changed, 24 insertions, 1 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 4b08749b22..c7635e27c7 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -26,7 +26,7 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libagl\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -fvisibility=hidden -LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui +LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui libnativewindow LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S LOCAL_CFLAGS_arm += -fstrict-aliasing diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 04f6d6d1a3..b79051c499 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -56,6 +56,24 @@ EGLBoolean EGLAPI eglSetSwapRectangleANDROID(EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height); + +typedef struct egl_native_pixmap_t +{ + int32_t version; /* must be 32 */ + int32_t width; + int32_t height; + int32_t stride; + uint8_t* data; + uint8_t format; + uint8_t rfu[3]; + union { + uint32_t compressedFormat; + int32_t vstride; + }; + int32_t reserved; +} egl_native_pixmap_t; + + // ---------------------------------------------------------------------------- namespace android { diff --git a/opengl/tests/hwc/Android.bp b/opengl/tests/hwc/Android.bp index b6e6f0eed9..425f3740e4 100644 --- a/opengl/tests/hwc/Android.bp +++ b/opengl/tests/hwc/Android.bp @@ -34,6 +34,10 @@ cc_library_static { "libglTest", "libtestUtil", ], + shared_libs: [ + "libui", + "libnativewindow" + ], defaults: ["hwc_tests_defaults"], } @@ -48,6 +52,7 @@ cc_defaults { "liblog", "libui", "libutils", + "libnativewindow" ], static_libs: [ |