Added few more stubs so that control reaches to DestroyDevice().

[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 d7647a76bd0cf20c3b05436327c2c7a7c6e5c290..8eb6aabe836f35f2c9bcc14112583ef0bb4e0bec 100644 (file)
--- 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:
@@ -41,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
 
@@ -60,13 +56,19 @@ LOCAL_C_INCLUDES := \
        $(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_STATIC_LIBRARIES += \
+       libmesa_nir
 
 LOCAL_WHOLE_STATIC_LIBRARIES += \
-       libmesa_program
+       libmesa_program \
+       libmesa_git_sha1
 
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
-
-endif # MESA_BUILD_CLASSIC