[android] Toolchain build fixes

android/jni/Android.mk

@@ -8,18 +8,19 @@ LOCAL_HEADER_FILES := \
 	jni_helper.h \
 	jni_string.h \
 	logging.h \
-	
-	
+
 LOCAL_SRC_FILES := \
 	main_native.cpp \
 	jni_helper.cpp \
 	jni_string.cpp \
 	platform.cpp \
-	
-	
-LOCAL_LDLIBS := -llog -lstdc++ -L../../omim-android-debug/out/debug \
+
+LOCAL_LDLIBS := -llog \
   	-lwords -lmap -lstorage -lversion -lsearch -lindexer -lyg -lplatform \
   	-lgeometry -lcoding -lbase -lexpat -lfreetype -lfribidi -lzlib -lbzip2 \
-  	-ljansson -ltomcrypt
+  	-ljansson -ltomcrypt ./obj/local/armeabi/libstdc++.a
+
+LOCAL_LDLIBS += -L../../omim-android-debug/out/debug
+#LOCAL_LDLIBS += -L../../omim-android-release/out/release
 
 include $(BUILD_SHARED_LIBRARY)

android/jni/Application.mk

@@ -1,2 +1,7 @@
-APP_STL := stlport_static
-APP_CFLAGS += -I../3party/boost
+APP_STL := gnustl_static
+APP_CFLAGS += -I../3party/boost
+APP_CPPFLAGS += -fexceptions -frtti
+
+# comment this to enable release build
+APP_OPTIM := debug
+APP_CFLAGS += -DDEBUG -D_DEBUG

tools/mkspecs/android-g++/qmake.conf

@@ -36,7 +36,7 @@ QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH
 QMAKE_CFLAGS_WARN_ON    = -Wall -W
 QMAKE_CFLAGS_WARN_OFF   =
 QMAKE_CFLAGS_RELEASE    = -mthumb -O3 -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64
-QMAKE_CFLAGS_DEBUG      = -marm -O0 -g -fno-omit-frame-pointer
+QMAKE_CFLAGS_DEBUG      = -mthumb -O0 -g -fno-omit-frame-pointer
 QMAKE_CFLAGS_SHLIB      = -fPIC
 QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD     = -D_REENTRANT
@@ -44,6 +44,7 @@ QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
 
 QMAKE_CXX               = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLCHAIN_PREFIX-g++
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED
+QMAKE_CXXFLAGS         += -frtti -fexceptions
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE