commit 4c1b54bf6aea8259873106d4974e757aee70b3fc
author Jean-Baptiste Queru <jbq@google.com> Fri Jun 24 13:57:23 2011 -0700
committer Jean-Baptiste Queru <jbq@google.com> Fri Jun 24 13:57:50 2011 -0700
tree 105185bf5740dbc972fd735d33af077ac1120e07
parent a6fdc590b0261afef9960ea23e6e264441e09bdc
parent a4f65ce780e319268a9f300a9edbc07657adff0a

Merge 3c1b974a and a4f65ce7

Change-Id: I536026aab833367350b595b41911e9888cff2e3a

Android.mk

diff --git a/Android.mk b/Android.mk
index bcf8ba7..3f65320 100644
--- a/Android.mk
+++ b/Android.mk
@@ -278,7 +278,7 @@
   gpu/src/GrContext.cpp \
   gpu/src/GrCreatePathRenderer_none.cpp \
   gpu/src/GrDrawTarget.cpp \
-  gpu/src/GrGLDefaultInterface_none.cpp \
+  gpu/src/android/GrGLDefaultInterface_android.cpp \
   gpu/src/GrGLIndexBuffer.cpp	\
   gpu/src/GrGLInterface.cpp \
   gpu/src/GrGLProgram.cpp \
@@ -322,7 +322,8 @@
   $(LOCAL_PATH)/gpu/src \
   $(LOCAL_PATH)/include/core \
   $(LOCAL_PATH)/include/gpu \
-  $(LOCAL_PATH)/src/core
+  $(LOCAL_PATH)/src/core \
+  frameworks/base/opengl/include/GLES2
 
 LOCAL_LDLIBS += -lpthread