improve openssl patch

Author: obfusk

pythonforandroid/recipes/openssl/__init__.py

@@ -131,7 +131,8 @@ def build_arch(self, arch):
                 buildarch,
                 '-D__ANDROID_API__={}'.format(self.ctx.ndk_api),
             ]
-            self.apply_patch('standalone-ndk.patch', arch.arch)
+            if self.ctx.ndk_standalone:
+                self.apply_patch('standalone-ndk.patch', arch.arch)
             shprint(perl, 'Configure', *config_args, _env=env)
             self.apply_patch('disable-sover.patch', arch.arch)
 

pythonforandroid/recipes/openssl/standalone-ndk.patch

@@ -1,11 +1,19 @@
 --- a/Configurations/15-android.conf	2021-01-02 03:49:06.227255874 +0100
-+++ b/Configurations/15-android.conf	2021-01-02 04:06:22.239571311 +0100
-@@ -107,16 +107,20 @@
++++ b/Configurations/15-android.conf	2021-01-02 05:57:26.205585631 +0100
+@@ -8,7 +8,7 @@
+ 
+     my $android_ndk = {};
+     my %triplet = (
+-        arm    => "arm-linux-androideabi",
++        arm    => "armv7a-linux-androideabi",
+         arm64  => "aarch64-linux-android",
+         mips   => "mipsel-linux-android",
+         mips64 => "mips64el-linux-android",
+@@ -107,16 +107,19 @@
                  }
              } elsif (-f "$ndk/AndroidVersion.txt") {    #"standalone toolchain"
                  my $cc = $user{CC} // "clang";
-+                my $ndk_api = $ENV{NDK_API};
-+                if ($ndk_api =~ m|^android-(\d+)$|) {
++                if ($ENV{NDK_API} =~ m|^android-(\d+)$|) {
 +                  $api = $1;
 +                }
                  # One can probably argue that both clang and gcc should be