summaryrefslogtreecommitdiff
path: root/Android.common.mk
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@android-x86.org>2015-05-20 11:25:39 +0800
committerEric Anholt <eric@anholt.net>2015-06-09 12:25:50 -0700
commitc5e11e5f7f67fe5a1d28b1446f87af7aa3ba68d8 (patch)
treec7112533346a1c976e9a81fcb24e307cfb75f6df /Android.common.mk
parent1842832660c4eade037caa760110b58a2d7f055b (diff)
downloadmesa-c5e11e5f7f67fe5a1d28b1446f87af7aa3ba68d8.tar.gz
mesa-c5e11e5f7f67fe5a1d28b1446f87af7aa3ba68d8.tar.bz2
mesa-c5e11e5f7f67fe5a1d28b1446f87af7aa3ba68d8.zip
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 <cwhuang@linux.org.tw> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'Android.common.mk')
-rw-r--r--Android.common.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk
index 43766bf8c57..d662d6018e4 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -77,6 +77,7 @@ LOCAL_CFLAGS += \
endif
LOCAL_CPPFLAGS += \
+ $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
-Wno-error=non-virtual-dtor \
-Wno-non-virtual-dtor