android: Enable OpenGL ES 2.0.

diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index c473716..7a61d15 100644 (file)
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -16,6 +16,14 @@ glapi_C_INCLUDES := \
        external/mesa/include \
        external/mesa/src/mapi
 
+# use x86 assembly to generate ES2 entries on the fly
+glapi_SOURCES += \
+       $(addprefix es1api/glapi/, $(X86_API))
+glapi_CFLAGS += \
+       -DUSE_X86_ASM
+glapi_C_INCLUDES += \
+       external/mesa/src/mesa
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_glapi

diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
index 28f5beb..00de3c1 100644 (file)
--- a/src/mesa/drivers/Android.mk
+++ b/src/mesa/drivers/Android.mk
@@ -167,6 +167,7 @@ common_CFLAGS := \
        -DPTHREADS \
        -DFEATURE_GL=1 \
        -DFEATURE_ES1=1 \
+       -DFEATURE_ES2=1 \
        -fvisibility=hidden \
        -Wno-sign-compare