diff options
| author | Chad Versace <[email protected]> | 2012-11-07 15:26:46 -0800 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-11-12 15:52:42 -0800 |
| commit | 5f935af67524746b5a8086bd62f5acbe99d96f32 (patch) | |
| tree | 9c52409067ab66620cfb42870db099a0d0668d4c /src/mesa/Android.mk | |
| parent | f2b638a997e384a04716cea83162cb2fa331669e (diff) | |
android: Moves rules for mesa_gen_matypes 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 host executable mesa_gen_matypes from
Android.mk to Android.mesa_gen_matypes.mk.
Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/Android.mk')
| -rw-r--r-- | src/mesa/Android.mk | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index dad2b9a6cf1..d57323507bd 100644 --- a/src/mesa/Android.mk +++ b/src/mesa/Android.mk @@ -37,25 +37,9 @@ 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) - +common_ASM := $(X86_FILES) endif # x86 endif # MESA_ENABLE_ASM @@ -113,4 +97,5 @@ include $(BUILD_STATIC_LIBRARY) endif # MESA_BUILD_CLASSIC +include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk |