Revert "Revert CSM particles commit to fix particle spawner bug for 5.0.0 (#8288)"

[dragonfireclient.git] / build / android / jni / Application.mk

diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk
index dfe7afb3dcc6d29c7520f1bdc1b7d6902ca48c16..f5eb96ed175edd8f4637465cd37f3cb6a5c21880 100644 (file)
--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@@ -1,9 +1,9 @@
 APP_PLATFORM := ${APP_PLATFORM}
 APP_ABI := ${TARGET_ABI}
-APP_STL := gnustl_static
-NDK_TOOLCHAIN_VERSION := 4.9
-APP_DEPRECATED_HEADERS := true
+APP_STL := c++_shared
 APP_MODULES := minetest
+ifndef NDEBUG
+APP_OPTIM := debug
+endif
 
-APP_CPPFLAGS += -fexceptions
-APP_GNUSTL_FORCE_CPP_FEATURES := rtti
+APP_CPPFLAGS += -fexceptions -std=c++11 -frtti