summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600
diff options
context:
space:
mode:
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)