2019-03-04 23:25:09 +01:00
|
|
|
--- ../setup-env.sh.orig 2019-03-04 22:56:56.693240356 +0100
|
|
|
|
|
+++ ./releng/setup-env.sh 2019-03-04 22:57:18.379906864 +0100
|
2018-09-29 18:33:27 +02:00
|
|
|
@@ -97,8 +97,8 @@
|
2018-03-05 22:15:17 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ $host_platform = android ]; then
|
2018-09-29 18:33:27 +02:00
|
|
|
- ndk_required_name=r17b
|
|
|
|
|
- ndk_required_version=17.1.4828580
|
2019-03-04 23:25:09 +01:00
|
|
|
+ ndk_required_name=r19b
|
|
|
|
|
+ ndk_required_version=19.1.5304403
|
2018-03-05 22:15:17 +01:00
|
|
|
if [ -n "$ANDROID_NDK_ROOT" ]; then
|
|
|
|
|
if [ -f "$ANDROID_NDK_ROOT/source.properties" ]; then
|
|
|
|
|
ndk_installed_version=$(grep Pkg.Revision "$ANDROID_NDK_ROOT/source.properties" | awk '{ print $NF; }')
|
2018-09-29 18:33:27 +02:00
|
|
|
@@ -414,7 +414,7 @@
|
2018-06-12 23:19:03 +02:00
|
|
|
|
|
|
|
|
case $host_arch in
|
|
|
|
|
x86)
|
2018-09-29 18:33:27 +02:00
|
|
|
- android_api=14
|
|
|
|
|
+ android_api=21
|
|
|
|
|
host_triplet="i686-linux-android"
|
|
|
|
|
host_arch_flags="-march=i686"
|
|
|
|
|
host_ldflags="-fuse-ld=gold"
|
|
|
|
|
@@ -426,7 +426,7 @@
|
|
|
|
|
host_ldflags="-fuse-ld=gold"
|
2018-06-12 23:19:03 +02:00
|
|
|
;;
|
|
|
|
|
arm)
|
2018-09-29 18:33:27 +02:00
|
|
|
- android_api=14
|
|
|
|
|
+ android_api=21
|
|
|
|
|
host_triplet="arm-linux-androideabi"
|
|
|
|
|
host_arch_flags="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
|
|
|
|
host_ldflags="-fuse-ld=gold -Wl,--fix-cortex-a8 -Wl,--icf=safe"
|
