summaryrefslogtreecommitdiffstats
path: root/make/scripts/setenv-android-tools.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-12-10 18:56:43 +0100
committerSven Gothel <[email protected]>2019-12-10 18:56:43 +0100
commitb6a91a035c14f1e4d142517f311007e48ea9c0c1 (patch)
tree1c4913130dc7d3872a506230eec4fd1d1dd16022 /make/scripts/setenv-android-tools.sh
parent74e5bbe097a07d1275a2d6452d1e2336a8d5c44a (diff)
Bug 1417 - Android: Complete 1st round: make/lib/gluegen-cpptask-android-<abi>.xml and scripts
All aligned now - gluegen-cpptasks-android-aarch64.xml - gluegen-cpptasks-android-armv6.xml (this has ld flag --no-undefined disabled, due to internal missing symbols) - gluegen-cpptasks-android-x86.xml
Diffstat (limited to 'make/scripts/setenv-android-tools.sh')
-rw-r--r--make/scripts/setenv-android-tools.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/make/scripts/setenv-android-tools.sh b/make/scripts/setenv-android-tools.sh
index b0e6144..7f7dd56 100644
--- a/make/scripts/setenv-android-tools.sh
+++ b/make/scripts/setenv-android-tools.sh
@@ -25,7 +25,7 @@
# - ANDROID_HOST_TAG - defaults to linux-x86_64
#
# - ANDROID_ABI - defaults to x86_64, one of
-# armeabi-v7a
+# armeabi-v7a (with NEON by default since NDK r21)
# arm64-v8a
# x86_64
# x86
@@ -97,6 +97,7 @@ if [ -z "${ANDROID_ABI}" ] ; then
echo "Setting undefined ANDROID_ABI to ${ANDROID_ABI} default!"
fi
if [ "${ANDROID_ABI}" = "armeabi-v7a" ] ; then
+ # with NEON by default since NDK r21
ANDROID_SYSROOT_ABI=arm
#CMAKE_SYSTEM_PROCESSOR=armv7-a
ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi