Switch to NDK 26

ankitects · Oct 28, 2023 · b539c73 · b539c73
1 parent 351f702
commit b539c73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build_rust/src/main.rs b/build_rust/src/main.rs
@@ -15,8 +15,8 @@ fn main() -> Result<()> {
         return Ok(());
     }
     let ndk_path = Utf8PathBuf::from(env::var("ANDROID_NDK_HOME").unwrap_or_default());
-    if !ndk_path.file_name().unwrap_or_default().starts_with("25.") {
-        panic!("Expected ANDROID_NDK_HOME to point to a 25.x NDK. Future versions may work, but are untested.");
+    if !ndk_path.file_name().unwrap_or_default().starts_with("26.") {
+        panic!("Expected ANDROID_NDK_HOME to point to a 26.x NDK. Future versions may work, but are untested.");
     }
 
     build_web_artifacts()?;

diff --git a/rslib-bridge/build.rs b/rslib-bridge/build.rs
@@ -33,7 +33,7 @@ fn main() -> Result<()> {
         } else {
             "windows-x86_64"
         };
-        let lib_dir = format!("/toolchains/llvm/prebuilt/{platform}/lib64/clang/14.0.7/lib/linux/");
+        let lib_dir = format!("/toolchains/llvm/prebuilt/{platform}/lib/clang/17/lib/linux/");
         println!("cargo:rustc-link-search={android_ndk_home}/{lib_dir}");
         println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android");
     }