android: enable x86 asm and sse4 for x86 and x86_64

[android-x86/external-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 a3e6c6d..8de90b8 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -31,6 +31,7 @@ LOCAL_PATH := $(call my-dir)
 # Import the following variables:
 #     MESA_FILES
 #     X86_FILES
+#     X86_64_FILES
 include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
@@ -42,30 +43,30 @@ LOCAL_SRC_FILES := \
        $(MESA_FILES)
 
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
-ifeq ($(TARGET_ARCH),x86)
-       LOCAL_SRC_FILES += $(X86_FILES)
-endif # x86
+       LOCAL_SRC_FILES_x86 += $(X86_FILES)
+       LOCAL_SRC_FILES_x86_64 += $(X86_64_FILES)
 endif # MESA_ENABLE_ASM
 
-ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
-LOCAL_SRC_FILES += \
-       main/streaming-load-memcpy.c \
-       main/sse_minmax.c
-LOCAL_CFLAGS := \
-       -msse4.1 \
-       -DUSE_SSE41
-endif
-
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa/main \
        $(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_GENERATED_SOURCES += \
+       $(MESA_GEN_GLSL_H)
 
-LOCAL_WHOLE_STATIC_LIBRARIES := \
+LOCAL_WHOLE_STATIC_LIBRARIES += \
        libmesa_program
 
+LOCAL_WHOLE_STATIC_LIBRARIES_x86 += \
+       libmesa_sse41 \
+
+LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += \
+       libmesa_sse41 \
+
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)