projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18174ba
)
Configuration/15-android.conf: slightly move NDK canonisation
author
Richard Levitte
<levitte@openssl.org>
Sun, 12 Aug 2018 12:22:16 +0000
(14:22 +0200)
committer
Richard Levitte
<levitte@openssl.org>
Sun, 12 Aug 2018 12:47:05 +0000
(14:47 +0200)
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)
Configurations/15-android.conf
patch
|
blob
|
history
diff --git
a/Configurations/15-android.conf
b/Configurations/15-android.conf
index 89c5d0ad894db2a636bc12a21aad60f62a3e889d..d3b428b6cb465489e40bc6bff20989ce8f7f23d9 100644
(file)
--- 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;