Break the dependency on the wrapper libEGL.

src/OpenGL/include/EGL/eglplatform.h

@@ -85,8 +85,6 @@ typedef void *EGLNativePixmapType;
 
 #elif defined(__ANDROID__) || defined(ANDROID)
 
-#include <android/native_window.h>
-
 struct egl_native_pixmap_t;
 
 typedef struct ANativeWindow*           EGLNativeWindowType;

src/OpenGL/libEGL/Android.mk

@@ -29,7 +29,6 @@ COMMON_STATIC_LIBRARIES := \
 COMMON_SHARED_LIBRARIES := \
 	libdl \
 	liblog \
-	libandroid \
 	libutils \
 	libcutils \
 	libhardware \

src/OpenGL/libEGL/Surface.cpp

@@ -230,6 +230,22 @@ WindowSurface::WindowSurface(Display *display, const Config *config, EGLNativeWi
     frameBuffer = nullptr;
 }
 
+#ifdef __ANDROID__
+static int32_t getWindowProp(ANativeWindow* window, int what) {
+    int value;
+    int res = window->query(window, what, &value);
+    return res < 0 ? res : value;
+}
+
+static int32_t ANativeWindow_getHeight(ANativeWindow* window) {
+    return getWindowProp(window, NATIVE_WINDOW_HEIGHT);
+}
+
+static int32_t ANativeWindow_getWidth(ANativeWindow* window) {
+  return getWindowProp(window, NATIVE_WINDOW_WIDTH);
+}
+#endif
+
 bool WindowSurface::initialize()
 {
     ASSERT(!frameBuffer && !backBuffer && !depthStencil);