Skip to content

Commit 2d057be

Browse files
committed
android 29 no ca path and bundle
1 parent 8ba5b85 commit 2d057be

File tree

1 file changed

+7
-25
lines changed

1 file changed

+7
-25
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ jobs:
3939
arch: arm64-v8a
4040
configure:
4141
--host aarch64-linux-android29
42-
--with-openssl=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr
42+
--with-openssl
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
@@ -56,7 +58,9 @@ jobs:
5658
arch: x86_64
5759
configure:
5860
--host x86_64-linux-android29
59-
--with-openssl=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr
61+
--with-openssl
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
@@ -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__=29
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"

0 commit comments

Comments
 (0)