diff options
| author | Rob Herring <robh@kernel.org> | 2017-03-21 13:51:20 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-03-22 17:53:31 +0000 |
| commit | 7a5b5f52260e33681b2aff6e544520c44f8710c0 (patch) | |
| tree | d87608c22e89058dc820e98fd1c4bf34de2d0b33 /src/gallium/targets | |
| parent | 0e1ff22d55816c9a3710257c2e705a98ad3282bc (diff) | |
Android: drop Android 4.4 (KitKat) support
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 <robh@kernel.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 940f5009a5..2385e8bf4f 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) |