diff --git a/jami-android/app/build.gradle.kts b/jami-android/app/build.gradle.kts index 9ba9e29f5926977d795ac7a6212835d81977b01e..a5a4e3c6c19572ad34d85499a5ae3d04db2789ee 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) } +}