From 3cc3461cb5e7f7dfc9ce44867e00c5cc51875fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 3 Aug 2016 13:37:32 +0200 Subject: [PATCH] [build] Use the JNIDIR as the platform string, since that's what Android Studio uses --- platform/android/scripts/toolchain.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/android/scripts/toolchain.sh b/platform/android/scripts/toolchain.sh index 0f782008036..73d78d72480 100755 --- a/platform/android/scripts/toolchain.sh +++ b/platform/android/scripts/toolchain.sh @@ -15,8 +15,7 @@ echo "set(CMAKE_SYSTEM_VERSION 1)" echo "set(CMAKE_CXX_COMPILER \"`which $(mason env CXX)`\")" echo "set(CMAKE_C_COMPILER \"`which $(mason env CC)`\")" echo "set(ANDROID_JNIDIR \"`mason env JNIDIR`\")" -echo "set(ANDROID_ABI \"${1:-arm-v7}\")" -echo "set(ENV{MASON_ANDROID_ABI} \"${1:-arm-v7}\")" +echo "set(ANDROID_ABI \"\${ANDROID_JNIDIR}\")" echo "set(CMAKE_EXE_LINKER_FLAGS \"`mason env LDFLAGS` \${CMAKE_EXE_LINKER_FLAGS}\")" echo "set(CMAKE_CXX_FLAGS \"-s -fvisibility=hidden -Os `mason env CXXFLAGS` \${CMAKE_CXX_FLAGS}\")" echo "set(CMAKE_C_FLAGS \"-s -fvisibility=hidden -Os `mason env CPPFLAGS` \${CMAKE_C_FLAGS}\")"