commit 3f84483382be2d528918cc1a6fbc6a7d68e0b181
author Mathias Agopian <mathias@google.com> Wed Aug 07 21:24:32 2013 -0700
committer Mathias Agopian <mathias@google.com> Tue Aug 13 16:07:45 2013 -0700
tree 81de0907cd7d64eea68e50539b82dc9d70c9f793
parent 5ff5a84e4829bad9eb44cc9a32d8579ca089051b

SurfaceFlinger now uses GLES 2.x when available

Bug: 8679321

Change-Id: I2b152d01fb4e2de2ea9fe87f1ddbd6826d7520d7

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 8dbb9c5..7a14fb0 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -19,10 +19,15 @@
     DisplayHardware/VirtualDisplaySurface.cpp \
     EventLog/EventLogTags.logtags \
     EventLog/EventLog.cpp \
+    RenderEngine/Description.cpp \
+    RenderEngine/Mesh.cpp \
+    RenderEngine/Program.cpp \
+    RenderEngine/ProgramCache.cpp \
     RenderEngine/GLExtensions.cpp \
     RenderEngine/RenderEngine.cpp \
     RenderEngine/GLES10RenderEngine.cpp \
-    RenderEngine/GLES11RenderEngine.cpp
+    RenderEngine/GLES11RenderEngine.cpp \
+    RenderEngine/GLES20RenderEngine.cpp
 
 
 LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
@@ -56,6 +61,7 @@
 	libutils \
 	libEGL \
 	libGLESv1_CM \
+	libGLESv2 \
 	libbinder \
 	libui \
 	libgui