Support for Android NDK r22
authorFred Hornsey <fred@hornsey.us>
Wed, 18 Nov 2020 04:20:43 +0000 (22:20 -0600)
committerMatt Caswell <matt@openssl.org>
Wed, 5 May 2021 09:50:26 +0000 (10:50 +0100)
commit9f85ab647c8c9f47a1523f99facdf15fc34797a0
tree61cef5de110f09e7617d85ae82e08ff830dbbb10
parent4b1be3c8868cf0b26a031f68ffebc34248e1836c
Support for Android NDK r22

This is a backport of #13434, Fixes #13685.

I think builds using standalone toolchain are fine so I left them alone,
but `Configure` will fail if using the NDK directly because the
`platforms` and `sysroot` directories were removed.

If `sysroot` is missing, omit the `--sysroot` and `-gcc-toolchain`
arguments and use the triplet form clang command.

Also since `platforms` was being used for the default API level, use
`meta/platforms.json` instead if needed.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13694)
Configurations/15-android.conf