Skip to content

Commit 4bd506f

Browse files
committed
android without ca bundle and without ca path
1 parent 69b83e4 commit 4bd506f

File tree

1 file changed

+16
-34
lines changed

1 file changed

+16
-34
lines changed

.github/workflows/main.yml

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,37 +38,41 @@ jobs:
3838
- os: ubuntu-latest
3939
arch: arm64-v8a
4040
configure:
41-
--host aarch64-linux-android26
42-
--with-openssl=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr
41+
--host aarch64-linux-android29
42+
--with-ssl
43+
--without-ca-bundle
44+
--without-ca-path
4345
LIBS="-lssl -lcrypto"
4446
AR=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
4547
AS=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
46-
CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang
47-
CXX=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang++
48+
CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android29-clang
49+
CXX=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android29-clang++
4850
LD=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
4951
RANLIB=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
5052
STRIP=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
5153
name: android
5254
make:
5355
PLATFORM=android
54-
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang
56+
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android29-clang
5557
- os: ubuntu-latest
5658
arch: x86_64
5759
configure:
58-
--host x86_64-linux-android26
59-
--with-openssl=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr
60+
--host x86_64-linux-android29
61+
--with-ssl
62+
--without-ca-bundle
63+
--without-ca-path
6064
LIBS="-lssl -lcrypto"
6165
AR=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
6266
AS=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
63-
CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang
64-
CXX=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang++
67+
CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android29-clang
68+
CXX=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android29-clang++
6569
LD=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
6670
RANLIB=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
6771
STRIP=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
6872
name: android
6973
make:
7074
PLATFORM=android
71-
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang
75+
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android29-clang
7276
sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
7377
- os: macos-latest
7478
configure:
@@ -109,28 +113,6 @@ jobs:
109113
tag: 'curl-8_12_1'
110114
extract: true
111115
fileName: curl-*.tar.gz
112-
113-
- name: build openssl
114-
if: matrix.name == 'android'
115-
run: |
116-
git clone https://github.com/openssl/openssl.git
117-
cd openssl
118-
export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64
119-
export ARCH=${{ matrix.arch }}
120-
export PATH=$TOOLCHAIN/bin:$PATH
121-
122-
./Configure android-${{ matrix.arch == 'arm64-v8a' && 'arm64' || matrix.arch }} \
123-
--prefix=$PWD/build \
124-
--openssldir=$PWD/build/ssl \
125-
no-shared \
126-
no-unit-test \
127-
-D__ANDROID_API__=26
128-
make
129-
make install_sw
130-
131-
cp build/lib/libssl.a $TOOLCHAIN/sysroot/usr/lib/
132-
cp build/lib/libcrypto.a $TOOLCHAIN/sysroot/usr/lib/
133-
cp -r build/include/openssl $TOOLCHAIN/sysroot/usr/include/
134116

135117
- name: build curl
136118
run: |
@@ -239,7 +221,7 @@ jobs:
239221
export ${{ matrix.make }}
240222
$CC sqlite-amalgamation-*/shell.c sqlite-amalgamation-*/sqlite3.c -o sqlite3 -ldl
241223
# remove unused folders to save up space
242-
rm -rf sqlite-amalgamation-*.zip sqlite-amalgamation-* curl-* openssl
224+
rm -rf sqlite-amalgamation-*.zip sqlite-amalgamation-* curl-*
243225
echo "::endgroup::"
244226
245227
echo "::group::prepare the test script"
@@ -255,7 +237,7 @@ jobs:
255237
if: matrix.name == 'android' && matrix.arch != 'arm64-v8a'
256238
uses: reactivecircus/[email protected]
257239
with:
258-
api-level: 26
240+
api-level: 29
259241
arch: ${{ matrix.arch }}
260242
script: |
261243
adb root

0 commit comments

Comments
 (0)