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>
This commit is contained in:
parent
7071ffb464
commit
0ef8535747
|
@ -0,0 +1,61 @@
|
||||||
|
# Copyright 2012 Intel Corporation
|
||||||
|
# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
|
||||||
|
# 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_st_mesa.a
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
|
||||||
|
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
|
||||||
|
# Import variables:
|
||||||
|
# MESA_GALLIUM_FILES.
|
||||||
|
# X86_FILES
|
||||||
|
include $(LOCAL_PATH)/sources.mak
|
||||||
|
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
|
LOCAL_MODULE := libmesa_st_mesa
|
||||||
|
|
||||||
|
MESA_ENABLED_APIS := ES1 ES2
|
||||||
|
|
||||||
|
LOCAL_SRC_FILES := \
|
||||||
|
$(MESA_GALLIUM_FILES)
|
||||||
|
|
||||||
|
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
|
||||||
|
ifeq ($(TARGET_ARCH),x86)
|
||||||
|
LOCAL_SRC_FILES += $(X86_FILES)
|
||||||
|
endif # x86
|
||||||
|
endif # MESA_ENABLE_ASM
|
||||||
|
|
||||||
|
LOCAL_C_INCLUDES := \
|
||||||
|
$(MESA_TOP)/src/gallium/auxiliary \
|
||||||
|
$(MESA_TOP)/src/gallium/include \
|
||||||
|
$(MESA_TOP)/src/glsl \
|
||||||
|
$(MESA_TOP)/src/mapi
|
||||||
|
|
||||||
|
include $(LOCAL_PATH)/Android.gen.mk
|
||||||
|
include $(MESA_COMMON_MK)
|
||||||
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
endif # MESA_BUILD_GALLIUM
|
|
@ -1,7 +1,4 @@
|
||||||
# Mesa 3-D graphics library
|
# Copyright 2012 Intel Corporation
|
||||||
#
|
|
||||||
# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
|
|
||||||
# Copyright (C) 2010-2011 LunarG Inc.
|
|
||||||
#
|
#
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
# copy of this software and associated documentation files (the "Software"),
|
# 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
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
# DEALINGS IN THE SOFTWARE.
|
# DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
# Android.mk for core mesa
|
|
||||||
|
|
||||||
LOCAL_PATH := $(call my-dir)
|
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.mesa_gen_matypes.mk
|
||||||
include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk
|
include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk
|
||||||
include $(LOCAL_PATH)/Android.libmesa_dricore.mk
|
include $(LOCAL_PATH)/Android.libmesa_dricore.mk
|
||||||
|
include $(LOCAL_PATH)/Android.libmesa_st_mesa.mk
|
||||||
|
|
Loading…
Reference in New Issue