[Android] Dropped stlport in favor of libc++ which supports C++11

examples/android/jni/Application.mk

@@ -1,4 +1,5 @@
+NDK_TOOLCHAIN_VERSION := 4.8
 APP_PLATFORM := android-17
-APP_STL := stlport_shared
+APP_STL := c++_shared
-APP_ABI := armeabi-v7a
+APP_ABI := all
 APP_MODULES := sfml-activity sfml-example

src/SFML/Main/SFMLActivity.cpp

@@ -171,7 +171,7 @@ void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_
     jobject ObjectActivityInfo = lJNIEnv->CallObjectMethod(ObjectPackageManager, MethodGetActivityInfo, ObjectComponentName, (jint)128);
 
     // Load our libraries in reverse order
-    loadLibrary("stlport_shared", lJNIEnv, ObjectActivityInfo);
+    loadLibrary("c++_shared", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-system", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-window", lJNIEnv, ObjectActivityInfo);
     loadLibrary("sfml-graphics", lJNIEnv, ObjectActivityInfo);

src/SFML/Window/Android/WindowImplAndroid.cpp

@@ -51,7 +51,7 @@ WindowImplAndroid::WindowImplAndroid(WindowHandle handle)
 
 
 ////////////////////////////////////////////////////////////
-WindowImplAndroid::WindowImplAndroid(VideoMode mode, const std::string& title, unsigned long style, const ContextSettings& settings)
+WindowImplAndroid::WindowImplAndroid(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings)
 {
     ActivityStates* states = getActivity(NULL);
     Lock lock(states->mutex);

src/SFML/Window/Android/WindowImplAndroid.hpp

@@ -64,7 +64,7 @@ public :
     /// \param settings Additional settings for the underlying OpenGL context
     ///
     ////////////////////////////////////////////////////////////
-    WindowImplAndroid(VideoMode mode, const std::string& title, unsigned long style, const ContextSettings& settings);
+    WindowImplAndroid(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings);
 
     ////////////////////////////////////////////////////////////
     /// \brief Destructor