1 files changed, 6 insertions, 129 deletions
diff --git a/mesalib/src/mesa/Android.mk b/mesalib/src/mesa/Android.mk
index c32b1c0c1..20f781948 100644
--- a/mesalib/src/mesa/Android.mk
+++ b/mesalib/src/mesa/Android.mk
@@ -1,7 +1,4 @@
-# Mesa 3-D graphics library
-#
-# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
-# Copyright (C) 2010-2011 LunarG Inc.
+# Copyright 2012 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,131 +18,11 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-# Android.mk for core mesa
-
 LOCAL_PATH := $(call my-dir)
 
-# Import the following variables:
-#     MESA_CXX_FILES
-#     MESA_GALLIUM_CXX_FILES
-#     MESA_GALLIUM_FILES
-#     MESA_FILES
-#     X86_FILES
-include $(LOCAL_PATH)/sources.mak
-
-MESA_ENABLED_APIS := ES1 ES2
-
-common_C_INCLUDES := \
-	$(MESA_TOP)/src/mapi \
-	$(MESA_TOP)/src/glsl
-
-common_ASM :=
-
-# ---------------------------------------
-# Build mesa_gen_matypes for host
-# ---------------------------------------
-
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
-ifeq ($(TARGET_ARCH),x86)
-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)
-
-endif # x86
-endif # MESA_ENABLE_ASM
-
-# ---------------------------------------
-# Build libmesa_st_mesa
-# ---------------------------------------
-
-ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	$(MESA_GALLIUM_FILES) \
-	$(MESA_GALLIUM_CXX_FILES) \
-	$(common_ASM)
-
-LOCAL_CFLAGS := $(common_CFLAGS)
-
-LOCAL_C_INCLUDES := \
-	$(common_C_INCLUDES) \
-	$(MESA_TOP)/src/gallium/include \
-	$(MESA_TOP)/src/gallium/auxiliary
-
-LOCAL_MODULE := libmesa_st_mesa
-
-include $(LOCAL_PATH)/Android.gen.mk
-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) \
-        $(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
-#
-# It is used to avoid circular dependency between core mesa and glsl.
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	program/hash_table.c \
-	program/symbol_table.c
-
-LOCAL_MODULE := libmesa_glsl_utils
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libmesa_glsl_utils for host
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	program/hash_table.c \
-	program/symbol_table.c
-
-LOCAL_MODULE := libmesa_glsl_utils
-LOCAL_IS_HOST_MODULE := true
+include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk
+include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk
+include $(LOCAL_PATH)/Android.libmesa_dricore.mk
+include $(LOCAL_PATH)/Android.libmesa_st_mesa.mk
 
-include $(MESA_COMMON_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
+include $(LOCAL_PATH)/program/Android.mk