diff options
| author | Jérôme de Bretagne <jerome.debretagne@gmail.com> | 2019-11-06 21:45:58 +0100 |
|---|---|---|
| committer | Jérôme de Bretagne <jerome.debretagne@gmail.com> | 2019-11-06 22:38:16 +0100 |
| commit | 257e349058789c418dea2faab107cb238bcba987 (patch) | |
| tree | 0ce5f52b9bc64de50175d877827231d1298990a2 /xcomp | |
| parent | 21f14d1b89b21a2bdb630de3dd9c67c4642e5f14 (diff) | |
| download | erlang-257e349058789c418dea2faab107cb238bcba987.tar.gz | |
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.
Diffstat (limited to 'xcomp')
| -rw-r--r-- | xcomp/erl-xcomp-arm-android.conf | 2 | ||||
| -rw-r--r-- | xcomp/erl-xcomp-arm64-android.conf | 2 |
2 files changed, 2 insertions, 2 deletions
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. |