From 6223f10fae3ba7298b5827ddc63faef47c567fcc Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Sat, 23 May 2026 09:04:23 +0200
Subject: [PATCH] improve jni paths (#941)

---
 android-project/.gitignore           | 2 +-
 android-project/app/build.gradle.kts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android-project/.gitignore b/android-project/.gitignore
index 016088d3..cca6ed61 100644
--- a/android-project/.gitignore
+++ b/android-project/.gitignore
@@ -2,7 +2,7 @@
 .gradle/
 build/
 
-app/src/main/jniLibs/
+jniLibs/
 
 # Local configuration file (sdk path, etc)
 local.properties
diff --git a/android-project/app/build.gradle.kts b/android-project/app/build.gradle.kts
index 90016634..672da645 100644
--- a/android-project/app/build.gradle.kts
+++ b/android-project/app/build.gradle.kts
@@ -56,8 +56,8 @@ val ndkBuild = tasks.register<Exec>("ndkBuild") {
     environment("ANDROID_NDK_HOME", "$ndkDir")
     environment("LIBCLANG_PATH", "$ndkDir/toolchains/llvm/prebuilt/linux-x86_64/musl/lib")
 
-    val jniLibsFolder = layout.projectDirectory.dir("$rootDir/app/src/main/jniLibs")
-    project.delete(jniLibsFolder)
+    val jniType = if (isRelease) "release" else "debug"
+    val jniLibsFolder = "$rootDir/app/src/$jniType/jniLibs"
 
     commandLine(
         "cargo", "ndk",
@@ -65,7 +65,7 @@ val ndkBuild = tasks.register<Exec>("ndkBuild") {
         "-P", "$minSdk",
         "-t", "arm64-v8a",
         "-t", "x86_64",
-        "-o", "$rootDir/app/src/main/jniLibs",
+        "-o", jniLibsFolder,
         "build", "--lib",
         "--profile", if (isRelease) "release" else "dev",
     )