android: fix the building rules for Android 5.0
Android 5.0 allows modules to generate source into $OUT/gen, which will then be copied into $OUT/obj and $OUT/obj_$(TARGET_2ND_ARCH) as necessary. Modules will need to change calls to local-intermediates-dir into local-generated-sources-dir. The patch changes local-intermediates-dir into local-generated-sources-dir. If the Android version is less than 5.0, fallback to local-intermediates-dir. The patch also fixes the 64-bit building issue of Android 5.0. v2 [Emil Velikov] - Keep the LOCAL_UNSTRIPPED_PATH variable. Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
This commit is contained in:
parent
671a550846
commit
b0e33c2256
|
@ -34,6 +34,13 @@ MESA_TOP := $(call my-dir)
|
||||||
MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
|
MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
|
||||||
MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
|
MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
|
||||||
MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION)
|
MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION)
|
||||||
|
ifeq ($(filter 1 2 3 4,$(MESA_ANDROID_MAJOR_VERSION)),)
|
||||||
|
MESA_LOLLIPOP_BUILD := true
|
||||||
|
else
|
||||||
|
define local-generated-sources-dir
|
||||||
|
$(call local-intermediates-dir)
|
||||||
|
endef
|
||||||
|
endif
|
||||||
|
|
||||||
MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
|
MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
|
||||||
MESA_PYTHON2 := python
|
MESA_PYTHON2 := python
|
||||||
|
|
|
@ -32,10 +32,16 @@ LOCAL_SRC_FILES := \
|
||||||
platform_android.c
|
platform_android.c
|
||||||
|
|
||||||
LOCAL_CFLAGS := \
|
LOCAL_CFLAGS := \
|
||||||
-DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" \
|
|
||||||
-DHAVE_SHARED_GLAPI \
|
-DHAVE_SHARED_GLAPI \
|
||||||
-DHAVE_ANDROID_PLATFORM
|
-DHAVE_ANDROID_PLATFORM
|
||||||
|
|
||||||
|
ifeq ($(MESA_LOLLIPOP_BUILD),true)
|
||||||
|
LOCAL_CFLAGS_x86 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
|
||||||
|
LOCAL_CFLAGS_x86_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\"
|
||||||
|
else
|
||||||
|
LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
|
||||||
|
endif
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := \
|
LOCAL_C_INCLUDES := \
|
||||||
$(MESA_TOP)/src/mapi \
|
$(MESA_TOP)/src/mapi \
|
||||||
$(MESA_TOP)/src/egl/main \
|
$(MESA_TOP)/src/egl/main \
|
||||||
|
|
|
@ -154,7 +154,11 @@ LOCAL_STATIC_LIBRARIES := \
|
||||||
libmesa_loader
|
libmesa_loader
|
||||||
|
|
||||||
LOCAL_MODULE := libGLES_mesa
|
LOCAL_MODULE := libGLES_mesa
|
||||||
|
ifeq ($(MESA_LOLLIPOP_BUILD),true)
|
||||||
|
LOCAL_MODULE_RELATIVE_PATH := egl
|
||||||
|
else
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
|
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
|
||||||
|
endif
|
||||||
|
|
||||||
include $(MESA_COMMON_MK)
|
include $(MESA_COMMON_MK)
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
|
@ -39,7 +39,7 @@ LOCAL_MODULE := libmesa_gallium
|
||||||
|
|
||||||
# generate sources
|
# generate sources
|
||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES))
|
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES))
|
||||||
|
|
||||||
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
||||||
|
|
|
@ -54,7 +54,7 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if defined(PIPE_OS_ANDROID)
|
#if defined(PIPE_OS_ANDROID) && !defined(__LP64__)
|
||||||
|
|
||||||
extern void *__mmap2(void *, size_t, int, int, int, size_t);
|
extern void *__mmap2(void *, size_t, int, int, int, size_t);
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ ifeq ($(LOCAL_MODULE_CLASS),)
|
||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
endif
|
endif
|
||||||
|
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
|
|
||||||
sources := \
|
sources := \
|
||||||
glsl_lexer.cpp \
|
glsl_lexer.cpp \
|
||||||
|
@ -43,7 +43,6 @@ sources := \
|
||||||
LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES))
|
LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES))
|
||||||
|
|
||||||
LOCAL_C_INCLUDES += \
|
LOCAL_C_INCLUDES += \
|
||||||
$(intermediates) \
|
|
||||||
$(intermediates)/glcpp \
|
$(intermediates)/glcpp \
|
||||||
$(intermediates)/nir \
|
$(intermediates)/nir \
|
||||||
$(MESA_TOP)/src/glsl/glcpp \
|
$(MESA_TOP)/src/glsl/glcpp \
|
||||||
|
|
|
@ -53,7 +53,7 @@ LOCAL_C_INCLUDES := \
|
||||||
LOCAL_MODULE := libglapi
|
LOCAL_MODULE := libglapi
|
||||||
|
|
||||||
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
|
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
abi_header := $(intermediates)/$(abi_header)
|
abi_header := $(intermediates)/$(abi_header)
|
||||||
LOCAL_GENERATED_SOURCES := $(abi_header)
|
LOCAL_GENERATED_SOURCES := $(abi_header)
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ ifeq ($(LOCAL_MODULE_CLASS),)
|
||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
endif
|
endif
|
||||||
|
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
|
|
||||||
# This is the list of auto-generated files: sources and headers
|
# This is the list of auto-generated files: sources and headers
|
||||||
sources := \
|
sources := \
|
||||||
|
|
|
@ -34,10 +34,9 @@ include $(LOCAL_PATH)/Makefile.sources
|
||||||
LOCAL_MODULE := libmesa_dri_common
|
LOCAL_MODULE := libmesa_dri_common
|
||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
|
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := \
|
LOCAL_C_INCLUDES := \
|
||||||
$(intermediates) \
|
|
||||||
$(MESA_DRI_C_INCLUDES)
|
$(MESA_DRI_C_INCLUDES)
|
||||||
|
|
||||||
# swrast only
|
# swrast only
|
||||||
|
|
|
@ -26,8 +26,12 @@ LOCAL_PATH := $(call my-dir)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_MODULE := i915_dri
|
LOCAL_MODULE := i915_dri
|
||||||
|
ifeq ($(MESA_LOLLIPOP_BUILD),true)
|
||||||
|
LOCAL_MODULE_RELATIVE_PATH := $(notdir $(MESA_DRI_MODULE_PATH))
|
||||||
|
else
|
||||||
LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH)
|
LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH)
|
||||||
LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
|
LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
|
||||||
|
endif
|
||||||
|
|
||||||
# Import variables i915_FILES.
|
# Import variables i915_FILES.
|
||||||
include $(LOCAL_PATH)/Makefile.sources
|
include $(LOCAL_PATH)/Makefile.sources
|
||||||
|
|
|
@ -26,8 +26,12 @@ LOCAL_PATH := $(call my-dir)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_MODULE := i965_dri
|
LOCAL_MODULE := i965_dri
|
||||||
|
ifeq ($(MESA_LOLLIPOP_BUILD),true)
|
||||||
|
LOCAL_MODULE_RELATIVE_PATH := $(notdir $(MESA_DRI_MODULE_PATH))
|
||||||
|
else
|
||||||
LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH)
|
LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH)
|
||||||
LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
|
LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
|
||||||
|
endif
|
||||||
|
|
||||||
# Import variables i965_FILES.
|
# Import variables i965_FILES.
|
||||||
include $(LOCAL_PATH)/Makefile.sources
|
include $(LOCAL_PATH)/Makefile.sources
|
||||||
|
|
|
@ -46,7 +46,7 @@ LOCAL_MODULE := libmesa_program
|
||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
LOCAL_STATIC_LIBRARIES := libmesa_glsl
|
LOCAL_STATIC_LIBRARIES := libmesa_glsl
|
||||||
|
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
|
|
||||||
# TODO(chadv): In Makefile.sources, move these vars to a different list so we can
|
# TODO(chadv): In Makefile.sources, move these vars to a different list so we can
|
||||||
# remove this kludge.
|
# remove this kludge.
|
||||||
|
@ -72,7 +72,6 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
|
||||||
$(local-l-to-c)
|
$(local-l-to-c)
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := \
|
LOCAL_C_INCLUDES := \
|
||||||
$(intermediates) \
|
|
||||||
$(MESA_TOP)/src/mapi \
|
$(MESA_TOP)/src/mapi \
|
||||||
$(MESA_TOP)/src/mesa \
|
$(MESA_TOP)/src/mesa \
|
||||||
$(MESA_TOP)/src/glsl \
|
$(MESA_TOP)/src/glsl \
|
||||||
|
|
|
@ -45,7 +45,7 @@ LOCAL_MODULE := libmesa_util
|
||||||
|
|
||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
|
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
|
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
|
||||||
|
|
||||||
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
||||||
|
@ -80,7 +80,7 @@ LOCAL_MODULE := libmesa_util
|
||||||
|
|
||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
|
|
||||||
intermediates := $(call local-intermediates-dir)
|
intermediates := $(call local-generated-sources-dir)
|
||||||
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
|
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
|
||||||
|
|
||||||
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
||||||
|
|
Loading…
Reference in New Issue