Revert "mesa: enable KHR_debug for ES contexts"

[mesa.git] / src / mesa / Android.libmesa_dricore.mk

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 00c06943c0ba2b73a9f8922a9bc2ed9e3fdcd9f3..2e308b837332c4a3e453ee39638e7642372e97b0 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -38,8 +38,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_dricore
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-MESA_ENABLED_APIS := ES1 ES2 GL
-
 LOCAL_SRC_FILES := \
        $(MESA_FILES)
 
@@ -49,13 +47,21 @@ ifeq ($(TARGET_ARCH),x86)
 endif # x86
 endif # MESA_ENABLE_ASM
 
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_SRC_FILES += \
+       main/streaming-load-memcpy.c \
+       mesa/main/sse_minmax.c
 LOCAL_CFLAGS := \
-   $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
+       -msse4.1 \
+       -DUSE_SSE41
+endif
 
 LOCAL_C_INCLUDES := \
-       $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/glsl
+       $(MESA_TOP)/src/mesa/main \
+       $(MESA_TOP)/src/glsl \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_program