Skip to content

Commit 1c9bd61

Browse files
committed
updated android sdk
1 parent 9be8300 commit 1c9bd61

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/android.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
- uses: actions/setup-java@v4
2323
with:
2424
distribution: 'temurin'
25-
java-version: '17'
25+
java-version: '23'
2626
- uses: android-actions/setup-android@v3
2727
- uses: nttld/setup-ndk@v1
2828
id: setup-ndk
2929
with:
30-
ndk-version: r21d
30+
ndk-version: r28
3131
- uses: actions/setup-go@v5
3232
with:
3333
go-version: '^1.23'

Makefile.android

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ANDROID_HOME?=$(HOME)/Android/Sdk
2-
ANDROID_NDK_HOME?=$(ANDROID_HOME)/ndk/21.3.6528147
2+
ANDROID_NDK_HOME?=$(ANDROID_HOME)/ndk/28.0.13004108
33
ANDROID_NDK_TOOLCHAIN?=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64/bin
44
ANDROID_OUTPUT?=android/jniLibs
55
ANDROID_BINDING_NAME?=$(BINDING_NAME).so
@@ -8,24 +8,24 @@ binding_android: binding_android_arm64 binding_android_armv7a binding_android_x8
88

99
binding_android_arm64:
1010
BINDING_FILE=$(ANDROID_OUTPUT)/arm64-v8a/$(ANDROID_BINDING_NAME) \
11-
CC=$(ANDROID_NDK_TOOLCHAIN)/aarch64-linux-android21-clang \
11+
CC=$(ANDROID_NDK_TOOLCHAIN)/aarch64-linux-android28-clang \
1212
EXTRA_LD_FLAGS="-extldflags=-Wl,-soname,$(ANDROID_BINDING_NAME)" \
1313
GOOS=android GOARCH=arm64 CGO_ENABLED=1 make binding
1414

1515
binding_android_armv7a:
1616
BINDING_FILE=$(ANDROID_OUTPUT)/armeabi-v7a/$(ANDROID_BINDING_NAME) \
17-
CC=$(ANDROID_NDK_TOOLCHAIN)/armv7a-linux-androideabi21-clang \
17+
CC=$(ANDROID_NDK_TOOLCHAIN)/armv7a-linux-androideabi28-clang \
1818
EXTRA_LD_FLAGS="-extldflags=-Wl,-soname,$(ANDROID_BINDING_NAME)" \
1919
GOOS=android GOARCH=arm GOARM=7 CGO_ENABLED=1 make binding
2020

2121
binding_android_x86:
2222
BINDING_FILE=$(ANDROID_OUTPUT)/x86/$(ANDROID_BINDING_NAME) \
23-
CC=$(ANDROID_NDK_TOOLCHAIN)/i686-linux-android21-clang \
23+
CC=$(ANDROID_NDK_TOOLCHAIN)/i686-linux-android28-clang \
2424
EXTRA_LD_FLAGS="-extldflags=-Wl,-soname,$(ANDROID_BINDING_NAME)" \
2525
GOOS=android GOARCH=386 CGO_ENABLED=1 make binding
2626

2727
binding_android_x86_64:
2828
BINDING_FILE=$(ANDROID_OUTPUT)/x86_64/$(ANDROID_BINDING_NAME) \
29-
CC=$(ANDROID_NDK_TOOLCHAIN)/x86_64-linux-android21-clang \
29+
CC=$(ANDROID_NDK_TOOLCHAIN)/x86_64-linux-android28-clang \
3030
EXTRA_LD_FLAGS="-extldflags=-Wl,-soname,$(ANDROID_BINDING_NAME)" \
3131
GOOS=android GOARCH=amd64 CGO_ENABLED=1 make binding

0 commit comments

Comments
 (0)