diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-11-07 15:38:14 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-11-12 15:52:42 -0800 |
| commit | 0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e (patch) | |
| tree | 5003957d0769c61c296c596d532377546ba337df /src/mesa/Android.mk | |
| parent | 7071ffb46457e9584328bd178bbe7d7156a8904e (diff) | |
| download | external_mesa3d-0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e.zip external_mesa3d-0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e.tar.gz external_mesa3d-0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e.tar.bz2 | |
android: Moves rules for libmesa_st_mesa to separate makefile
The pair of files src/mesa/Android.mk and src/mesa/Android.gen.mk are too
long and complex to be easily understood. This patch belongs to a series
that decomposes them into several easily digestible makefiles.
This patch move the rules for libmesa_st_mesa.a from Android.mk to
Android.libmesa_st_mesa.mk.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src/mesa/Android.mk')
| -rw-r--r-- | src/mesa/Android.mk | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index b024ce4..01055cc 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,53 +18,9 @@ # 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_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 - -ifeq ($(strip $(MESA_ENABLE_ASM)),true) -ifeq ($(TARGET_ARCH),x86) -common_ASM := $(X86_FILES) -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) \ - $(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 - 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 |