summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-03-21 13:51:20 -0500
committerEmil Velikov <[email protected]>2017-03-22 17:53:31 +0000
commit7a5b5f52260e33681b2aff6e544520c44f8710c0 (patch)
treed87608c22e89058dc820e98fd1c4bf34de2d0b33 /src/gallium/drivers/r600
parent0e1ff22d55816c9a3710257c2e705a98ad3282bc (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 <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
-rw-r--r--src/gallium/drivers/r600/Android.mk8
1 files changed, 2 insertions, 6 deletions
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)