From af48a8da6ddeadebd8918a6cfe73336df5ad1608 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Mon, 30 Sep 2024 11:56:37 -0400
Subject: [PATCH] build: run make-swig once, before kotlin

Change-Id: I143a33c8dc43d84e07607088638cd4c2bb72c67a
---
 jami-android/app/build.gradle.kts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jami-android/app/build.gradle.kts b/jami-android/app/build.gradle.kts
index 9ba9e29f5..a5a4e3c6c 100644
--- a/jami-android/app/build.gradle.kts
+++ b/jami-android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 val kotlin_version: String by rootProject.extra
 val hilt_version: String by rootProject.extra
 val dokka_version: String by rootProject.extra
@@ -28,7 +30,7 @@ android {
                 arguments += listOf(
                     "-DANDROID_STL=c++_shared",
                     "-DBUILD_CONTRIB=ON",
-                    "-DBUILD_EXTRA_TOOLS=ON",
+                    "-DBUILD_EXTRA_TOOLS=OFF",
                     "-DJAMI_TESTS=OFF",
                     "-DBUILD_TESTING=OFF",
                     "-DJAMI_JNI=ON",
@@ -184,3 +186,9 @@ if (buildFirebase) {
     println ("apply plugin $buildFirebase")
     apply(plugin = "com.google.gms.google-services")
 }
+
+// Make sure the native build runs before the Kotlin/Java build
+afterEvaluate {
+    val cmakeTasks = tasks.matching { it.name.startsWith("buildCMake") }
+    tasks.withType<KotlinCompile>().configureEach { dependsOn(cmakeTasks) }
+}
-- 
GitLab