2 files changed, 64 insertions, 29 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
new file mode 100644
index 00000000000..48a37a19730
--- /dev/null
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -0,0 +1,63 @@
+# Copyright 2012 Intel Corporation
+# Copyright (C) 2010-2011 Chia-I Wu <[email protected]>
+# Copyright (C) 2010-2011 LunarG Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# ----------------------------------------------------------------------
+# libmesa_dricore.a
+# ----------------------------------------------------------------------
+
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+
+LOCAL_PATH := $(call my-dir)
+
+# Import the following variables:
+#     MESA_FILES
+#     X86_FILES
+include $(LOCAL_PATH)/sources.mak
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_dricore
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+MESA_ENABLED_APIS := ES1 ES2 GL
+
+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
+
+LOCAL_CFLAGS := \
+   $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
+
+LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/mapi \
+	$(MESA_TOP)/src/glsl
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+endif # MESA_BUILD_CLASSIC
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index d57323507bd..b024ce42ae6 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -68,34 +68,6 @@ 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
-
-MESA_ENABLED_APIS += GL
-LOCAL_CFLAGS := \
-   $(common_CFLAGS) \
-   $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
-
-LOCAL_C_INCLUDES := \
-	$(common_C_INCLUDES)
-
-LOCAL_SRC_FILES := \
-        $(MESA_FILES) \
-        $(common_ASM)
-
-include $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-endif # MESA_BUILD_CLASSIC
-
 include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk
 include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk
+include $(LOCAL_PATH)/Android.libmesa_dricore.mk