summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/Android.mk
diff options
context:
space:
mode:
authorChih-Wei Huang <[email protected]>2015-05-20 11:25:39 +0800
committerEric Anholt <[email protected]>2015-06-09 12:25:50 -0700
commitc5e11e5f7f67fe5a1d28b1446f87af7aa3ba68d8 (patch)
treec7112533346a1c976e9a81fcb24e307cfb75f6df /src/gallium/drivers/r600/Android.mk
parent1842832660c4eade037caa760110b58a2d7f055b (diff)
android: build with libcxx on android lollipop
On Lollipop, apparently stlport is gone and libcxx must be used instead. We still support stlport when building on earlier android releases. Signed-off-by: Chih-Wei Huang <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/Android.mk')
-rw-r--r--src/gallium/drivers/r600/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index e9357597a9b..bfe39873089 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -33,6 +33,10 @@ LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
LOCAL_SHARED_LIBRARIES := libdrm 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)