[build] Use the JNIDIR as the platform string, since that's what Andr…

…oid Studio uses
mapbox · Aug 5, 2016 · 3cc3461 · 3cc3461
1 parent da37ba1
commit 3cc3461
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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}\")"