mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Migrate to android-ndk-13x.

Browse source
This commit is contained in:
vng 2016-11-05 14:04:10 +03:00 • committed by alexzatsepin
parent 0f2c45fff5
commit 8376453ebe
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape/glfunctions.cpp
View file

@ -18,8 +18,6 @@
#if defined(OMIM_OS_WINDOWS)
#define DP_APIENTRY __stdcall
#elif defined(OMIM_OS_ANDROID)
#define DP_APIENTRY __NDK_FPABI__
#else
#define DP_APIENTRY
#endif

5
tools/mkspecs/android-clang/qmake.conf
View file

@ -61,7 +61,7 @@ contains(ANDROID_TARGET_ABI, x86) {
QMAKE_CFLAGS *= -fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mthumb -fomit-frame-pointer -fno-strict-aliasing -fno-integrated-as
PLATFORM_INCLUDE_PATH = $$(NDK_ROOT)/platforms/$$ANDROID_PLATFORM/arch-arm/usr/include
ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../llvm-libc++abi/libcxxabi/include
ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../llvm-libc++abi/include
AR_FULL_PATH = $$(NDK_ROOT)/toolchains/arm-linux-androideabi-$$GCC_VERSION/prebuilt/$$(NDK_HOST)/bin/arm-linux-androideabi-ar
contains(ANDROID_TARGET_ABI, armeabi-v7a-hard) {
@ -106,9 +106,8 @@ QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
# modifications to linux.conf
QMAKE_AR = $$AR_FULL_PATH cqsD
#ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../llvm-libc++abi/libcxxabi/include
QMAKE_INCDIR = $$BASE_CXX_INCLUDE_PATH/libcxx/include
QMAKE_INCDIR = $$BASE_CXX_INCLUDE_PATH/include
QMAKE_INCDIR *= $$ABI_INCLUDE_PATH
QMAKE_INCDIR *= $$BASE_CXX_INCLUDE_PATH/../../android/support/include
QMAKE_INCDIR *= $$PLATFORM_INCLUDE_PATH