Skip to content

Commit 63ecbb1

Browse files
committed
use android api version 31
1 parent f653b40 commit 63ecbb1

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
shell: bash
4949

5050
steps:
51-
5251
- uses: actions/[email protected]
5352

5453
- uses: msys2/[email protected]
@@ -89,7 +88,7 @@ jobs:
8988
curl -O ${{ matrix.sqlite-amalgamation-zip }}
9089
unzip sqlite-amalgamation-*.zip
9190
export ${{ matrix.make }}
92-
$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.arch }}-linux-android26-clang sqlite-amalgamation-*/shell.c sqlite-amalgamation-*/sqlite3.c -o sqlite3 -ldl
91+
$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.arch }}-linux-android31-clang sqlite-amalgamation-*/shell.c sqlite-amalgamation-*/sqlite3.c -o sqlite3 -ldl
9392
# remove unused folders to save up space
9493
rm -rf sqlite-amalgamation-*.zip sqlite-amalgamation-* openssl
9594
echo "::endgroup::"
@@ -107,7 +106,7 @@ jobs:
107106
if: matrix.name == 'android' && matrix.arch != 'arm64-v8a'
108107
uses: reactivecircus/[email protected]
109108
with:
110-
api-level: 26
109+
api-level: 31
111110
arch: ${{ matrix.arch }}
112111
script: |
113112
adb root
@@ -145,7 +144,6 @@ jobs:
145144
GH_TOKEN: ${{ github.token }}
146145

147146
steps:
148-
149147
- uses: actions/[email protected]
150148

151149
- uses: actions/[email protected]
@@ -174,7 +172,7 @@ jobs:
174172
fi
175173
echo "❌ CLOUDSYNC_VERSION not found in cloudsync.h"
176174
exit 1
177-
175+
178176
- name: zip artifacts
179177
run: |
180178
for folder in "artifacts"/*; do
@@ -197,4 +195,4 @@ jobs:
197195
cloudsync-*-${{ steps.tag.outputs.version }}.zip
198196
cloudsync-*-${{ steps.tag.outputs.version }}.tar.xz
199197
cloudsync-*-${{ steps.tag.outputs.version }}.tar.gz
200-
make_latest: true
198+
make_latest: true

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ else ifeq ($(PLATFORM),android)
8989
endif
9090

9191
OPENSSL := $(BIN)/../sysroot/usr/include/openssl
92-
CC = $(BIN)/$(ARCH)-linux-android26-clang
93-
CURL_CONFIG = --host $(ARCH)-$(HOST)-android26 --with-openssl=$(BIN)/../sysroot/usr LIBS="-lssl -lcrypto" AR=$(BIN)/llvm-ar AS=$(BIN)/llvm-as CC=$(BIN)/$(ARCH)-linux-android26-clang CXX=$(BIN)/$(ARCH)-linux-android26-clang++ LD=$(BIN)/ld RANLIB=$(BIN)/llvm-ranlib STRIP=$(BIN)/llvm-strip
92+
CC = $(BIN)/$(ARCH)-linux-android31-clang
93+
CURL_CONFIG = --host $(ARCH)-$(HOST)-android31 --with-openssl=$(BIN)/../sysroot/usr LIBS="-lssl -lcrypto" AR=$(BIN)/llvm-ar AS=$(BIN)/llvm-as CC=$(BIN)/$(ARCH)-linux-android31-clang CXX=$(BIN)/$(ARCH)-linux-android31-clang++ LD=$(BIN)/ld RANLIB=$(BIN)/llvm-ranlib STRIP=$(BIN)/llvm-strip
9494
TARGET := $(DIST_DIR)/cloudsync.so
9595
LDFLAGS += -shared -lcrypto -lssl
9696
else ifeq ($(PLATFORM),ios)
@@ -173,7 +173,7 @@ $(OPENSSL):
173173
./Configure android-$(if $(filter aarch64,$(ARCH)),arm64,$(ARCH)) \
174174
--prefix=$(BIN)/../sysroot/usr \
175175
no-shared no-unit-test \
176-
-D__ANDROID_API__=26 && \
176+
-D__ANDROID_API__=31 && \
177177
$(MAKE) && $(MAKE) install_sw
178178

179179
ifeq ($(PLATFORM),android)

0 commit comments

Comments
 (0)