Skip to content

Commit 6d6f376

Browse files
committed
android back to the ndk clang compiler
1 parent b78815b commit 6d6f376

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
name: android
5050
make:
5151
PLATFORM=android
52-
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang++
52+
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang
5353
- os: ubuntu-latest
5454
arch: x86_64
5555
configure:
@@ -66,7 +66,7 @@ jobs:
6666
name: android
6767
make:
6868
PLATFORM=android
69-
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang++
69+
CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang
7070
sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
7171
- os: macos-latest
7272
configure:
@@ -271,14 +271,6 @@ jobs:
271271
if: matrix.name == 'macos'
272272
run: brew install lcov && make test COVERAGE=true
273273

274-
- name: deploy coverage HTML to GitHub Pages
275-
if: matrix.name == 'macos'
276-
uses: peaceiris/actions-gh-pages@v4
277-
with:
278-
github_token: ${{ secrets.GITHUB_TOKEN }}
279-
publish_dir: ./coverage
280-
force_orphan: true
281-
282274
- uses: actions/[email protected]
283275
if: always()
284276
with:

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ else ifeq ($(PLATFORM),macos)
6262
else ifeq ($(PLATFORM),android)
6363
# Use Android NDK's Clang compiler, the user should set the CC
6464
# example CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang
65-
65+
ifeq ($(filter %-clang,$(CC)),)
66+
$(error "CC must be set to the Android NDK's Clang compiler")
67+
endif
6668
TARGET := $(DIST_DIR)/cloudsync.so
6769
LDFLAGS += -shared -lcrypto -lssl -lc++
6870
else ifeq ($(PLATFORM),ios)

0 commit comments

Comments
 (0)