Merge pull request #72 from Arakawa96/master

Update build-android-openssl.sh
leenjewel · May 23, 2023 · 663da9e · 663da9e
2 parents ccd02ba + 0feaf76
commit 663da9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 </thead>
 <tbody>
 <tr><td>openssl</td><td>1.1.1d</td><td>ios</td><td>armv7 arm64 arm64e x86_64 </td><td>aae1672</td></tr>
-<tr><td></td><td></td><td>android</td><td>armeabi-v7a arm64-v8a x86 x86_64 </td><td>aae1672</td></tr>
+<tr><td></td><td>1.1.1t</td><td>android</td><td>armeabi-v7a arm64-v8a x86 x86_64 </td><td>aae1672</td></tr>
 <tr><td>nghttp2</td><td>1.40.0</td><td>ios</td><td>armv7 arm64 arm64e x86x86_64 </td><td>aae1672</td></tr>
 <tr><td></td><td></td><td>android</td><td>armeabi-v7a arm64-v8a x86 x86_64 </td><td>aae1672</td></tr>
 <tr><td>curl</td><td>7.68.0</td><td>ios</td><td>armv7 arm64 arm64e x86_64 </td><td>aae1672</td></tr>
@@ -27,6 +27,7 @@ If you do not want to build it by yourself, you could download our prebuilt libr
  - [openssl-1.1.0f.tar.gz](https://www.openssl.org/source/openssl-1.1.0f.tar.gz)
  - [openssl-1.1.1d.tar.gz](https://www.openssl.org/source/openssl-1.1.1d.tar.gz)
  - [openssl-1.1.1i.tar.gz](https://www.openssl.org/source/openssl-1.1.1i.tar.gz)
+ - [openssl-1.1.1t.tar.gz](https://www.openssl.org/source/openssl-1.1.1t.tar.gz)
  - [https://github.com/openssl/openssl](https://github.com/openssl/openssl)
 
 ## nghttp2 Version
@@ -49,6 +50,7 @@ If you do not want to build it by yourself, you could download our prebuilt libr
  - ~~[android-ndk-r14b](https://dl.google.com/android/repository/android-ndk-r14b-darwin-x86_64.zip)~~
  - ~~android-ndk-r15 (**Do not try to build use 15 It will fail**)~~
  - [android-ndk-r21d-darwin](https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip) [android-ndk-r21d-linux](https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip)
+ - [android-ndk-r22b-darwin](https://dl.google.com/android/repository/android-ndk-r22b-darwin-x86_64.zip) [android-ndk-r22b-linux](https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip)
  - support api 23 above
 
 ## How to build

diff --git a/tools/build-android-openssl-all.sh b/tools/build-android-openssl-all.sh
@@ -0,0 +1,5 @@
+export api=21
+./build-android-openssl.sh x86_64
+./build-android-openssl.sh x86
+./build-android-openssl.sh arm
+./build-android-openssl.sh arm64
diff --git a/tools/build-android-openssl.sh b/tools/build-android-openssl.sh
@@ -21,7 +21,7 @@ set -u
 source ./build-android-common.sh
 
 if [ -z ${version+x} ]; then 
-  version="1.1.1i"
+  version="1.1.1t"
 fi
 
 init_log_color