+@@ -873,7 +881,10 @@
+ set( CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> \"${__stlLibPath}/libstlport_static.a\"")\r
+ endif()\r
+ else( ANDROID_USE_STLPORT )\r
+- if( EXISTS "${__stlLibPath}/libgnustl_static.a" )\r
++ if( EXISTS "${__stlLibPath}/libgnustl_shared.so" )\r
++ list( APPEND ANDROID_SYSTEM_LIB_DIRS "${__stlLibPath}" )\r
++ set(CMAKE_CXX_STANDARD_LIBRARIES "-lgnustl_shared")\r
++ elseif( EXISTS "${__stlLibPath}/libgnustl_static.a" )\r
+ __COPY_IF_DIFFERENT( "${__stlLibPath}/libgnustl_static.a" "${__ndklibspath}/libstdc++.a" )\r
+ elseif( ANDROID_ARCH_NAME STREQUAL "arm" AND EXISTS "${__stlLibPath}/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" )\r
+ __COPY_IF_DIFFERENT( "${__stlLibPath}/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" "${__ndklibspath}/libstdc++.a" )\r