ci: try fixing the kotlin bindings tests by using NDK 27

matrix-org · Aug 2, 2024 · b8c9d7a · b8c9d7a
1 parent be6bc44
commit b8c9d7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/bindings_ci.yml b/.github/workflows/bindings_ci.yml
@@ -91,7 +91,7 @@ jobs:
         uses: nttld/setup-ndk@v1
         id: install-ndk
         with:
-          ndk-version: r25c
+          ndk-version: r27
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable

diff --git a/bindings/matrix-sdk-ffi/build.rs b/bindings/matrix-sdk-ffi/build.rs
@@ -18,11 +18,11 @@ fn setup_x86_64_android_workaround() {
                 "Unsupported OS. You must use either Linux, MacOS or Windows to build the crate."
             ),
         };
-        const DEFAULT_CLANG_VERSION: &str = "14.0.7";
+        const DEFAULT_CLANG_VERSION: &str = "18";
         let clang_version =
             env::var("NDK_CLANG_VERSION").unwrap_or_else(|_| DEFAULT_CLANG_VERSION.to_owned());
         let linux_x86_64_lib_dir = format!(
-            "toolchains/llvm/prebuilt/{build_os}-x86_64/lib64/clang/{clang_version}/lib/linux/"
+            "toolchains/llvm/prebuilt/{build_os}-x86_64/lib/clang/{clang_version}/lib/linux/"
         );
         println!("cargo:rustc-link-search={android_ndk_home}/{linux_x86_64_lib_dir}");
         println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android");