diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-02-29 06:43:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-03-14 04:26:56 +0100 |
| commit | 99ffd5ade5b2bbb03650416a292da7a583672967 (patch) | |
| tree | f95ef471aefb05eee7a75d692e71fa9dd9d22438 /Configurations | |
| parent | 3cd14e5e65011660ad8e3603cf871c8366b565fd (diff) | |
Andoid cross compile: change ANDROID_NDK_HOME to ANDROID_NDK_ROOT
According to forum discussions with NDK developers, ANDROID_NDK_HOME
is used for something else.
Fixes #11205
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11206)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/15-android.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf index b28689a425..d8674978a5 100644 --- a/Configurations/15-android.conf +++ b/Configurations/15-android.conf @@ -24,17 +24,17 @@ my $ndk_var; my $ndk; - foreach (qw(ANDROID_NDK_HOME ANDROID_NDK)) { + foreach (qw(ANDROID_NDK_ROOT ANDROID_NDK)) { $ndk_var = $_; $ndk = $ENV{$ndk_var}; last if defined $ndk; } - die "\$ANDROID_NDK_HOME is not defined" if (!$ndk); + die "\$ANDROID_NDK_ROOT is not defined" if (!$ndk); if (!-d "$ndk/platforms" && !-f "$ndk/AndroidVersion.txt") { # $ndk/platforms is traditional "all-inclusive" NDK, while # $ndk/AndroidVersion.txt is so-called standalone toolchain # tailored for specific target down to API level. - die "\$ANDROID_NDK_HOME=$ndk is invalid"; + die "\$ANDROID_NDK_ROOT=$ndk is invalid"; } $ndk = canonpath($ndk); |