From 8376453ebe3ee244b86d67395a656865fad3e266 Mon Sep 17 00:00:00 2001 From: vng Date: Sat, 5 Nov 2016 14:04:10 +0300 Subject: [PATCH] [android] Migrate to android-ndk-13x. --- drape/glfunctions.cpp | 2 -- tools/mkspecs/android-clang/qmake.conf | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drape/glfunctions.cpp b/drape/glfunctions.cpp index 413cad27af..15887ac76b 100644 --- a/drape/glfunctions.cpp +++ b/drape/glfunctions.cpp @@ -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 diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index 84f75acb4e..0a0255b887 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -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