From 7a5b5f52260e33681b2aff6e544520c44f8710c0 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 21 Mar 2017 13:51:20 -0500 Subject: Android: drop Android 4.4 (KitKat) support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 --- src/gallium/drivers/nouveau/Android.mk | 4 ---- src/gallium/drivers/r600/Android.mk | 8 ++------ src/gallium/targets/dri/Android.mk | 10 ++-------- 3 files changed, 4 insertions(+), 18 deletions(-) (limited to 'src/gallium') 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) -- cgit v1.2.3