commit 8335f1ccccedb6655d96d9d5b697a7f0938235dd
author Mathias Agopian <mathias@google.com> Sat Feb 25 18:48:35 2012 -0800
committer Mathias Agopian <mathias@google.com> Mon Feb 27 13:03:08 2012 -0800
tree 30a7f8b3e646157365dd51222665a68753fa25e3
parent 57235fc65b5920f4867e66c8263efab49e92a21b

fix libgui header location

Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe

core/jni/com_google_android_gles_jni_EGLImpl.cpp

diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp
index 0f334c3..5483867 100644
--- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp
+++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp
@@ -21,20 +21,20 @@
 #include <android_runtime/android_graphics_SurfaceTexture.h>
 #include <utils/misc.h>
 
+
+#include <EGL/egl_display.h>
 #include <EGL/egl.h>
 #include <GLES/gl.h>
 
-#include <EGL/egl_display.h>
+#include <gui/Surface.h>
+#include <gui/SurfaceTexture.h>
+#include <gui/SurfaceTextureClient.h>
 
-#include <surfaceflinger/Surface.h>
 #include <SkBitmap.h>
 #include <SkPixelRef.h>
 
 #include <ui/ANativeObjectBase.h>
 
-#include <gui/SurfaceTexture.h>
-#include <gui/SurfaceTextureClient.h>
-
 namespace android {
 
 static jclass gConfig_class;
@@ -46,7 +46,6 @@
 static jfieldID gSurface_EGLSurfaceFieldID;
 static jfieldID gSurface_NativePixelRefFieldID;
 static jfieldID gConfig_EGLConfigFieldID;
-static jfieldID gSurface_SurfaceFieldID;
 static jfieldID gBitmap_NativeBitmapFieldID;
 
 static inline EGLDisplay getDisplay(JNIEnv* env, jobject o) {