From 257e349058789c418dea2faab107cb238bcba987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20de=20Bretagne?= Date: Wed, 6 Nov 2019 21:45:58 +0100 Subject: erts: Allow Android cross compilation to target Android 5.0 Lollipop if_nameindex and if_freenameindex were added in Android 7.0 Nougat so guard their usages when targeting earlier Android versions. Update the Android documentation accordingly. --- xcomp/erl-xcomp-arm-android.conf | 2 +- xcomp/erl-xcomp-arm64-android.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xcomp') diff --git a/xcomp/erl-xcomp-arm-android.conf b/xcomp/erl-xcomp-arm-android.conf index 64f976fce8..1bddd2d8b9 100644 --- a/xcomp/erl-xcomp-arm-android.conf +++ b/xcomp/erl-xcomp-arm-android.conf @@ -87,7 +87,7 @@ NDK_SYSROOT=$NDK_ROOT/sysroot # For older Android NDK versions still supporting GCC. #CC="arm-linux-androideabi-gcc --sysroot=$NDK_SYSROOT" # For more recent Android NDK versions only supporting Clang/LLVM. -#NDK_ABI_PLAT=androideabi24 # when targeting Android 7.0 Nougat +#NDK_ABI_PLAT=androideabi21 # when targeting Android 5.0 Lollipop CC="armv7a-linux-$NDK_ABI_PLAT-clang" # * `CFLAGS' - C compiler flags. diff --git a/xcomp/erl-xcomp-arm64-android.conf b/xcomp/erl-xcomp-arm64-android.conf index bedee510e1..e423651fed 100644 --- a/xcomp/erl-xcomp-arm64-android.conf +++ b/xcomp/erl-xcomp-arm64-android.conf @@ -85,7 +85,7 @@ NDK_SYSROOT=$NDK_ROOT/sysroot # * `CC' - C compiler. # # For recent Android NDK versions only supporting Clang/LLVM. -#NDK_ABI_PLAT=android24 # when targeting Android 7.0 Nougat +#NDK_ABI_PLAT=android21 # when targeting Android 5.0 Lollipop CC="aarch64-linux-$NDK_ABI_PLAT-clang" # * `CFLAGS' - C compiler flags. -- cgit v1.2.1