intel/compiler: Test compaction on Gen <= 12

[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 c7715a50c90ed9c8a8c0926ce88419c5d6c0758f..8eb6aabe836f35f2c9bcc14112583ef0bb4e0bec 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -39,17 +39,15 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_SRC_FILES := \
        $(MESA_FILES)
 
-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 := \
-       -msse4.1 \
+       -msse4.1 -mstackrealign \
        -DUSE_SSE41
 endif
 
@@ -64,6 +62,9 @@ LOCAL_C_INCLUDES := \
 LOCAL_GENERATED_SOURCES += \
        $(MESA_GEN_GLSL_H)
 
+LOCAL_STATIC_LIBRARIES += \
+       libmesa_nir
+
 LOCAL_WHOLE_STATIC_LIBRARIES += \
        libmesa_program \
        libmesa_git_sha1