X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FAndroid.libmesa_dricore.mk;h=792117767b46abbdfed7b0cc1be0a9b5b3dbe759;hb=f793a8663df1a84230e1041447eacec9db4c0fde;hp=c2a4c288b75d98c207497c0291da51f2bf99c98c;hpb=0afbd2df0485cd480979d9f4cdae00262d1a3c62;p=mesa.git

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index c2a4c288b75..792117767b4 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -24,8 +24,6 @@
 # libmesa_dricore.a
 # ----------------------------------------------------------------------
 
-ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
-
 LOCAL_PATH := $(call my-dir)
 
 # Import the following variables:
@@ -48,30 +46,31 @@ endif # x86
 endif # MESA_ENABLE_ASM
 
 ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
-LOCAL_SRC_FILES += \
-	$(SRCDIR)main/streaming-load-memcpy.c \
-	$(SRCDIR)main/sse_minmax.c
-LOCAL_CFLAGS := -msse4.1
-endif
-
-ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
-LOCAL_CFLAGS += \
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+	libmesa_sse41
+LOCAL_CFLAGS := \
+	-msse4.1 -mstackrealign \
        -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/glsl \
+	$(MESA_TOP)/src/compiler/nir \
 	$(MESA_TOP)/src/gallium/include \
-	$(MESA_TOP)/src/gallium/auxiliary
+	$(MESA_TOP)/src/gallium/auxiliary \
+	$(dir $(MESA_GEN_GLSL_H))
 
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-	libmesa_program
+LOCAL_GENERATED_SOURCES += \
+	$(MESA_GEN_GLSL_H)
+
+LOCAL_STATIC_LIBRARIES += \
+	libmesa_nir
+
+LOCAL_WHOLE_STATIC_LIBRARIES += \
+	libmesa_program \
+	libmesa_git_sha1
 
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
-
-endif # MESA_BUILD_CLASSIC