X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FAndroid.mk;h=20f781948beefa8dc48cf9e3a5eff53e1c48fd00;hb=a98b675945bc7920ab7d2bbbf0b9641693a8de5d;hp=e32fabed49e0d5f79535d965b2aff54432703b20;hpb=ee40f18054088dad8e1d1eca2c44204576813d6b;p=mesa.git

diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index e32fabed49e..20f781948be 100644
--- a/src/mesa/Android.mk
+++ b/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,63 +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)
 
-include $(LOCAL_PATH)/sources.mak
-
-common_CFLAGS := \
-	-DFEATURE_ES1=1 \
-	-DFEATURE_ES2=1
-
-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_SOURCES)
-
-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
-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_SOURCES) \
-	$(MESA_GALLIUM_CXX_SOURCES) \
-	$(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.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 $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif # MESA_BUILD_GALLIUM
+include $(LOCAL_PATH)/program/Android.mk