From: Andy Polyakov <appro@openssl.org>
Date: Fri, 19 Oct 2018 14:03:28 +0000 (+0200)
Subject: Configurations/15-android.conf: fix implicit __ANDROID_API__ handling.
X-Git-Tag: OpenSSL_1_1_1a~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3453dbde7f0c44bcb97f85ee5291fc4fde0a45b2;p=openssl

Configurations/15-android.conf: fix implicit __ANDROID_API__ handling.

03ad7c009e16a233c733098db3169c560142ccd3 failed if one didn't pass
explicit -D__ANDROID_API__=N :-(

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7443)

(cherry picked from commit 71f2b3171e8b94b0fbdc7fab2d7ca4ea66edec2b)
---

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index a6b0d7a06d..f9ad0833fa 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -73,6 +73,8 @@
                 die "no $ndk/platforms/android-$api" if ($#platforms < 0);
 
                 $sysroot = "@platforms[$#platforms]/arch-$arch";
+                $sysroot =~ m|/android-([0-9]+)/arch-$arch|;
+                $api = $1;
             }
             die "no sysroot=$sysroot"   if (!-d $sysroot);