wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configurations/15-android.conf: Make sure that the NDK path is canonical

Browse source 
Extra slashes in paths are permissible in Unix-like platforms...
however, when compared with the result from 'which', which returns
canonical paths, the comparison might fail even though the compared
paths may be equivalent.  We make the NDK path canonical internally to
ensure the equivalence compares as equal, at least for the most
trivial cases.

Fixes #6917

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6924)
This commit is contained in:
Richard Levitte 2018-08-12 10:14:06 +02:00
parent cba024dc68
commit 18174ba8a3
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Configurations/15-android.conf
View file

@ -4,6 +4,8 @@
# comments below... # comments below...
{ {
use File::Spec::Functions;
my $android_ndk = {}; my $android_ndk = {};
my %triplet = ( my %triplet = (
arm => "arm-linux-androideabi", arm => "arm-linux-androideabi",
@ -22,6 +24,7 @@
my $ndk = $ENV{ANDROID_NDK}; my $ndk = $ENV{ANDROID_NDK};
die "\$ANDROID_NDK is not defined" if (!$ndk); die "\$ANDROID_NDK is not defined" if (!$ndk);
$ndk = canonpath($ndk);
die "\$ANDROID_NDK=$ndk is invalid" if (!-d "$ndk/platforms"); die "\$ANDROID_NDK=$ndk is invalid" if (!-d "$ndk/platforms");
my $ndkver = undef; my $ndkver = undef;