intel: fix the wrong code to detect null texture.

[mesa.git] / src / mesa / Android.mk

diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index 67808d491ac694d783a5d646bb2b077f29a8628c..f21ba3aa0d6c0ca09209fb13ebc91d25900cf5f5 100644 (file)
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -25,6 +25,12 @@
 
 LOCAL_PATH := $(call my-dir)
 
+# Import the following variables:
+#     MESA_CXX_SOURCES
+#     MESA_GALLIUM_CXX_SOURCES
+#     MESA_GALLIUM_SOURCES
+#     MESA_SOURCES
+#     X86_SOURCES
 include $(LOCAL_PATH)/sources.mak
 
 common_CFLAGS := \
@@ -82,6 +88,35 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif # MESA_BUILD_GALLIUM
 
+# ---------------------------------------
+# Build libmesa_dricore for DRI modules
+# ---------------------------------------
+
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_dricore
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_CFLAGS := \
+       $(common_CFLAGS) \
+       -DFEATURE_GL=1
+
+LOCAL_C_INCLUDES := \
+       $(common_C_INCLUDES)
+
+LOCAL_SRC_FILES := \
+        $(MESA_SOURCES) \
+        $(MESA_CXX_SOURCES) \
+        $(common_ASM)
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+endif # MESA_BUILD_CLASSIC
+
 # ---------------------------------------
 # Build libmesa_glsl_utils
 #