gh actions: android uses ndk 26 (latest)

latest use llvm upstream libc++ which fixed latest crashpad build issue.
Chilledheart · May 10, 2024 · c724991 · c724991
1 parent e3c3c9c
commit c724991
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/releases-android-binary.yml b/.github/workflows/releases-android-binary.yml
@@ -131,6 +131,10 @@ jobs:
         run: |
           cd tools
           go build
+      - name: Replace Android NDK (to latest)
+        run: |
+          echo "ANDROID_NDK_ROOT=${ANDROID_NDK_LATEST_HOME}" >> $GITHUB_ENV
+          echo "ANDROID_NDK_HOME=${ANDROID_NDK_LATEST_HOME}" >> $GITHUB_ENV
       - name: "Install dependency: tun2proxy"
         run: |
           ./scripts/setup-android-rust.sh

diff --git a/tools/build.go b/tools/build.go
@@ -515,7 +515,7 @@ func getAndFixMinGWLibunwind(mingwDir string) {
 }
 
 func getAndFixAndroidLibunwind(ndkDir string) {
-	getAndFixLibunwind(fmt.Sprintf("%s/toolchains/llvm/prebuilt/%s-x86_64/lib64/clang/14.0.7/lib/linux", ndkDir, runtime.GOOS), "linux")
+	getAndFixLibunwind(fmt.Sprintf("%s/toolchains/llvm/prebuilt/%s-x86_64/lib/clang/17/lib/linux", ndkDir, runtime.GOOS), "linux")
 }
 
 func getAndFixHarmonyLibunwind() {