summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-08-12 14:22:16 +0200
committerRichard Levitte <levitte@openssl.org>2018-08-12 14:47:05 +0200
commit9f9a7d60ad670e058f4c4e74eee5341caf970471 (patch)
tree1c1371ce0b9b5744144ab56a47eeff3513d3205b
parent18174ba8a3c634085c5cd15e0f28339e7b6cf679 (diff)
Configuration/15-android.conf: slightly move NDK canonisation
This allows the original path to be displayed when it's shown to be invalid, so the user can relate without question. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6925)
-rw-r--r--Configurations/15-android.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index 89c5d0ad89..d3b428b6cb 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -24,8 +24,8 @@
my $ndk = $ENV{ANDROID_NDK};
die "\$ANDROID_NDK is not defined" if (!$ndk);
- $ndk = canonpath($ndk);
die "\$ANDROID_NDK=$ndk is invalid" if (!-d "$ndk/platforms");
+ $ndk = canonpath($ndk);
my $ndkver = undef;