diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-10-19 16:03:28 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-31 15:43:53 +0100 |
| commit | 71f2b3171e8b94b0fbdc7fab2d7ca4ea66edec2b (patch) | |
| tree | 28c29d2870a818f4edfdca5eceec13763ece940a /Configurations/15-android.conf | |
| parent | 4011bab1f85d4429bad1e9388bed90a8d0da5639 (diff) | |
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)
Diffstat (limited to 'Configurations/15-android.conf')
| -rw-r--r-- | Configurations/15-android.conf | 2 |
1 files changed, 2 insertions, 0 deletions
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); |