[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ddf2e8c8ccad49cff0d6a0a0b26ca892ec4ce33a (commit)
       via  71f2b3171e8b94b0fbdc7fab2d7ca4ea66edec2b (commit)
      from  4011bab1f85d4429bad1e9388bed90a8d0da5639 (commit)


- Log -----------------------------------------------------------------
commit ddf2e8c8ccad49cff0d6a0a0b26ca892ec4ce33a
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Oct 19 22:24:30 2018 +0200

    Configurations/15-android.conf: detect NDK llvm-ar.
    
    This excluses user from additional PATH adjustments in case NDK has
    llvm-ar.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7443)

commit 71f2b3171e8b94b0fbdc7fab2d7ca4ea66edec2b
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Oct 19 16:03:28 2018 +0200

    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 at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7443)

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

Summary of changes:
 Configurations/15-android.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index a6b0d7a..10342ed 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);
 
@@ -92,6 +94,11 @@
                         .  "/$tritools-4.9/prebuilt/$host";
                 $user{CC} = "clang" if ($user{CC} !~ m|clang|);
                 $user{CROSS_COMPILE} = undef;
+                if (which("llvm-ar") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
+                    $user{AR} = "llvm-ar";
+                    $user{ARFLAGS} = [ "rs" ];
+                    $user{RANLIB} = ":";
+                }
             } elsif (-f "$ndk/AndroidVersion.txt") {    #"standalone toolchain"
                 my $cc = $user{CC} // "clang";
                 # One can probably argue that both clang and gcc should be