From: Richard Levitte <levitte@openssl.org>
Date: Sun, 12 Aug 2018 12:22:16 +0000 (+0200)
Subject: Configuration/15-android.conf: slightly move NDK canonisation
X-Git-Tag: OpenSSL_1_1_1-pre9~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9f9a7d60ad670e058f4c4e74eee5341caf970471;p=oweals%2Fopenssl.git

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)
---

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;