diff options
| author | vng <viktor.govako@gmail.com> | 2016-08-09 15:09:26 +0300 |
|---|---|---|
| committer | alexzatsepin <az@mapswithme.com> | 2017-02-14 15:47:26 +0300 |
| commit | 57ab411abd42f5be6fb3689a62b82bd46d3468b1 (patch) | |
| tree | f24c74bfb6510c541391ca16a25ee2c930c78dd7 /android/UnitTests | |
| parent | 1c7b0ae8d7e324a6f14a7840aabad261a2a577f5 (diff) | |
[android] Migrate to android-ndk-12x
Diffstat (limited to 'android/UnitTests')
| -rw-r--r-- | android/UnitTests/jni/Application.mk | 9 | ||||
| -rwxr-xr-x | android/UnitTests/native_build.sh | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/android/UnitTests/jni/Application.mk b/android/UnitTests/jni/Application.mk index b344b3daec..2ce81c26b9 100644 --- a/android/UnitTests/jni/Application.mk +++ b/android/UnitTests/jni/Application.mk @@ -1,8 +1,7 @@ -NDK_TOOLCHAIN_VERSION := clang3.5 -APP_ABI := armeabi-v7a-hard -# APP_ABI := armeabi-v7a +NDK_TOOLCHAIN_VERSION := clang +APP_ABI := armeabi-v7a -APP_PLATFORM := android-9 +APP_PLATFORM := android-15 APP_STL := c++_static # libc++-specific issues: -std=c++11" is turned on by default. @@ -11,7 +10,7 @@ APP_CPPFLAGS += -Wno-deprecated-register #@todo(vbykoianko) Build tests for android x86 platform #ifeq (x$(NDK_ABI_TO_BUILD), x) -# APP_ABI := armeabi-v7a-hard x86 +# APP_ABI := armeabi-v7a x86 #else # APP_ABI := $(NDK_ABI_TO_BUILD) #endif diff --git a/android/UnitTests/native_build.sh b/android/UnitTests/native_build.sh index 8329875781..e6418e0758 100755 --- a/android/UnitTests/native_build.sh +++ b/android/UnitTests/native_build.sh @@ -17,7 +17,7 @@ done -declare -r NDK_ABI=armeabi-v7a-hard +declare -r NDK_ABI=armeabi-v7a declare -r PROP_DEBUG_NDK_FLAGS="-j8 V=1 NDK_DEBUG=1 DEBUG=1 APP_ABI=$NDK_ABI" declare -r PROP_RELEASE_NDK_FLAGS="-j8 V=1 NDK_DEBUG=0 PRODUCTION=1 APP_ABI=$NDK_ABI" |