mesa: add OES_sample_variables to extension table, add enable bit

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

diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
index e7203c41dfea29a98db3680702cd23d8e8b2c0c4..9fd9460a5bac4af55b0cb79a34d640e92aa770cf 100644 (file)
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -37,8 +37,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_st_mesa
 
-MESA_ENABLED_APIS := ES1 ES2
-
 LOCAL_SRC_FILES := \
        $(MESA_GALLIUM_FILES)
 
@@ -48,12 +46,17 @@ ifeq ($(TARGET_ARCH),x86)
 endif # x86
 endif # MESA_ENABLE_ASM
 
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_CFLAGS := \
+       -DUSE_SSE41
+endif
+
 LOCAL_C_INCLUDES := \
-       $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/mesa/main \
+       $(MESA_TOP)/src/compiler/nir \
        $(MESA_TOP)/src/gallium/auxiliary \
-       $(MESA_TOP)/src/gallium/include \
-       $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/mapi
+       $(MESA_TOP)/src/gallium/include
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_program