diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-08-03 13:37:32 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 3cc3461cb5e7f7dfc9ce44867e00c5cc51875fb3 (patch) | |
| tree | 59073d084b5e30c4fad5e22aa914cddcc3817a7c /platform/android/scripts | |
| parent | da37ba1822c55de4d3c94b6e206b59b0b023264e (diff) | |
| download | qtlocation-mapboxgl-3cc3461cb5e7f7dfc9ce44867e00c5cc51875fb3.tar.gz | |
[build] Use the JNIDIR as the platform string, since that's what Android Studio uses
Diffstat (limited to 'platform/android/scripts')
| -rwxr-xr-x | platform/android/scripts/toolchain.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform/android/scripts/toolchain.sh b/platform/android/scripts/toolchain.sh index 0f78200803..73d78d7248 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}\")" |