[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9f9a7d60ad670e058f4c4e74eee5341caf970471 (commit)
      from  18174ba8a3c634085c5cd15e0f28339e7b6cf679 (commit)


- Log -----------------------------------------------------------------
commit 9f9a7d60ad670e058f4c4e74eee5341caf970471
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Aug 12 14:22:16 2018 +0200

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6925)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/15-android.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index 89c5d0a..d3b428b 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;