From 3006a7e74b59c58681e626ca40fe8f35dcfd3f6e Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 26 Jun 2011 00:33:33 +0300 Subject: [PATCH] [android] Toolchain build fixes --- android/jni/Android.mk | 13 +++++++------ android/jni/Application.mk | 9 +++++++-- tools/mkspecs/android-g++/qmake.conf | 3 ++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 269361b4d0..db51d7f100 100644 --- a/android/jni/Android.mk +++ b/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) diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 608c3805ac..281da9980e 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,2 +1,7 @@ -APP_STL := stlport_static -APP_CFLAGS += -I../3party/boost \ No newline at end of file +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 \ No newline at end of file diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index 2f97684ce1..9e6e95ff49 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/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