diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 36643d8..efd3667 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -71,11 +71,7 @@ android {
 	libraryVariants.all {
 		val variantName = name.replaceFirstChar(Char::titlecase)
 
-		// Make Java compilation depend on generating UniFFI bindings
-		javaCompileProvider.get().dependsOn("cargoBuild")
-
-		// Also hook into Kotlin compilation
-		tasks.named("compile${variantName}Kotlin").configure {
+		tasks.named("merge${variantName}JniLibFolders").configure {
 			dependsOn("cargoBuild")
 		}
 	}