Remove _mesa_sqrt* in favor of plain sqrt

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

diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index 67808d491ac694d783a5d646bb2b077f29a8628c..115db4703ef3a5235e44d18d26be89013a2a72d2 100644 (file)
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -25,6 +25,13 @@
 
 LOCAL_PATH := $(call my-dir)
 
+# Import the following variables:
+#     MESA_CXX_FILES
+#     MESA_GALLIUM_CXX_FILES
+#     MESA_GALLIUM_FILES
+#     MESA_FILES
+#     X86_FILES
+SRCDIR = .
 include $(LOCAL_PATH)/sources.mak
 
 common_CFLAGS := \
@@ -43,13 +50,14 @@ common_ASM :=
 
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
-common_ASM += $(X86_SOURCES)
+common_ASM += $(X86_FILES)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := x86/gen_matypes.c
 LOCAL_CFLAGS := $(common_CFLAGS)
 LOCAL_C_INCLUDES := $(common_C_INCLUDES)
 LOCAL_MODULE := mesa_gen_matypes
+LOCAL_IS_HOST_MODULE := true
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -64,8 +72,8 @@ ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-       $(MESA_GALLIUM_SOURCES) \
-       $(MESA_GALLIUM_CXX_SOURCES) \
+       $(MESA_GALLIUM_FILES) \
+       $(MESA_GALLIUM_CXX_FILES) \
        $(common_ASM)
 
 LOCAL_CFLAGS := $(common_CFLAGS)
@@ -82,6 +90,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_FILES) \
+        $(MESA_CXX_FILES) \
+        $(common_ASM)
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+endif # MESA_BUILD_CLASSIC
+
 # ---------------------------------------
 # Build libmesa_glsl_utils
 #
@@ -110,6 +147,7 @@ LOCAL_SRC_FILES := \
        program/symbol_table.c
 
 LOCAL_MODULE := libmesa_glsl_utils
+LOCAL_IS_HOST_MODULE := true
 
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)