gbm: remove superfluous/incorrect udev comment

[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 8b8d652a3f417f55ad2858203273ad0b34e11fba..3905ddcf2466eefe9e439f672575e6ce7fdc1688 100644 (file)
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -32,8 +32,6 @@ LOCAL_PATH := $(call my-dir)
 #      MESA_GALLIUM_FILES.
 #      X86_FILES
 include $(LOCAL_PATH)/Makefile.sources
-SRCDIR :=
-BUILDDIR :=
 
 include $(CLEAR_VARS)
 
@@ -42,23 +40,33 @@ LOCAL_MODULE := libmesa_st_mesa
 LOCAL_SRC_FILES := \
        $(MESA_GALLIUM_FILES)
 
+LOCAL_GENERATED_SOURCES := $(MESA_GEN_GLSL_H)
+
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
        LOCAL_SRC_FILES += $(X86_FILES)
 endif # x86
 endif # MESA_ENABLE_ASM
 
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libmesa_sse41
+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 \
-       $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/mapi
+       $(MESA_TOP)/src/gallium/include
 
-LOCAL_WHOLE_STATIC_LIBRARIES := \
+LOCAL_WHOLE_STATIC_LIBRARIES += \
        libmesa_program
 
+LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl
+
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)