From 7a5b5f52260e33681b2aff6e544520c44f8710c0 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 21 Mar 2017 13:51:20 -0500 Subject: [PATCH] Android: drop Android 4.4 (KitKat) support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Any users of KitKat are likely using an older version of Mesa and KitKat support adds complexity to the make files. Dropping support allows removing the MESA_LOLLIPOP_BUILD make variable in various make files. Signed-off-by: Rob Herring Reviewed-by: Tapani Pälli Reviewed-by: Emil Velikov --- Android.common.mk | 17 +++++------------ Android.mk | 8 -------- src/egl/Android.mk | 4 ---- src/gallium/drivers/nouveau/Android.mk | 4 ---- src/gallium/drivers/r600/Android.mk | 8 ++------ src/gallium/targets/dri/Android.mk | 10 ++-------- src/mesa/drivers/dri/i915/Android.mk | 5 ----- src/mesa/drivers/dri/i965/Android.mk | 5 ----- 8 files changed, 9 insertions(+), 52 deletions(-) diff --git a/Android.common.mk b/Android.common.mk index cd576152da7..34db6770c5b 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -65,7 +65,9 @@ LOCAL_CFLAGS += \ LOCAL_CPPFLAGS += \ -D__STDC_CONSTANT_MACROS \ -D__STDC_FORMAT_MACROS \ - -D__STDC_LIMIT_MACROS + -D__STDC_LIMIT_MACROS \ + -Wno-error=non-virtual-dtor \ + -Wno-non-virtual-dtor # mesa requires at least c99 compiler LOCAL_CONLYFLAGS += \ @@ -102,17 +104,8 @@ LOCAL_SHARED_LIBRARIES += libdrm endif endif -LOCAL_CPPFLAGS += \ - $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \ - -Wno-error=non-virtual-dtor \ - -Wno-non-virtual-dtor - -ifeq ($(MESA_LOLLIPOP_BUILD),true) - LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" - LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\" -else - LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" -endif +LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" +LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\" # uncomment to keep the debug symbols #LOCAL_STRIP_MODULE := false diff --git a/Android.mk b/Android.mk index 07a6cbae748..fdbf22fe643 100644 --- a/Android.mk +++ b/Android.mk @@ -32,14 +32,6 @@ MESA_TOP := $(call my-dir) MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) -MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_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_DRI_MODULE_REL_PATH := dri MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH) diff --git a/src/egl/Android.mk b/src/egl/Android.mk index 56d8859dd5f..a122c1d971a 100644 --- a/src/egl/Android.mk +++ b/src/egl/Android.mk @@ -70,11 +70,7 @@ endif # MESA_BUILD_GALLIUM LOCAL_MODULE := libGLES_mesa -ifeq ($(MESA_LOLLIPOP_BUILD),true) LOCAL_MODULE_RELATIVE_PATH := egl -else -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl -endif include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk index 839a3899cb7..3b26b592cdd 100644 --- a/src/gallium/drivers/nouveau/Android.mk +++ b/src/gallium/drivers/nouveau/Android.mk @@ -39,10 +39,6 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := libdrm_nouveau LOCAL_MODULE := libmesa_pipe_nouveau -ifeq ($(MESA_LOLLIPOP_BUILD),true) LOCAL_C_INCLUDES := external/libcxx/include -else -include external/stlport/libstlport.mk -endif include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 76ec3d048f5..7be3614c03e 100644 --- a/src/gallium/drivers/r600/Android.mk +++ b/src/gallium/drivers/r600/Android.mk @@ -30,16 +30,12 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES) -LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common +LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common \ + external/libcxx/include LOCAL_STATIC_LIBRARIES := libmesa_amd_common LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_r600 -ifeq ($(MESA_LOLLIPOP_BUILD),true) -LOCAL_C_INCLUDES := external/libcxx/include -else -include external/stlport/libstlport.mk -endif include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 940f5009a51..2385e8bf4f9 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -27,13 +27,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := gallium_dri -ifeq ($(MESA_LOLLIPOP_BUILD),true) LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) -else -LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH) -LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) -endif - LOCAL_SRC_FILES := target.c LOCAL_CFLAGS := @@ -92,7 +86,7 @@ gallium_DRIVERS += libmesa_winsys_svga libmesa_pipe_svga LOCAL_CFLAGS += -DGALLIUM_VMWGFX endif ifneq ($(filter nouveau r600g,$(MESA_GPU_DRIVERS)),) -LOCAL_SHARED_LIBRARIES += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),libc++,libstlport) +LOCAL_SHARED_LIBRARIES += libc++ endif LOCAL_WHOLE_STATIC_LIBRARIES := \ @@ -118,7 +112,7 @@ LOCAL_STATIC_LIBRARIES += \ libLLVMR600Info \ libLLVMR600AsmPrinter \ libelf -LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc) +LOCAL_LDLIBS += -lgcc endif include $(GALLIUM_COMMON_MK) diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk index 97359fa049d..62d388e08df 100644 --- a/src/mesa/drivers/dri/i915/Android.mk +++ b/src/mesa/drivers/dri/i915/Android.mk @@ -26,12 +26,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := i915_dri -ifeq ($(MESA_LOLLIPOP_BUILD),true) LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) -else -LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH) -LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) -endif # Import variables i915_FILES. include $(LOCAL_PATH)/Makefile.sources diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 708851c866f..abe8f20a8a1 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -158,12 +158,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := i965_dri -ifeq ($(MESA_LOLLIPOP_BUILD),true) LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) -else -LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH) -LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) -endif LOCAL_CFLAGS := \ $(MESA_DRI_CFLAGS) -- 2.30.2