Skip to content

Commit c5bb87e

Browse files
committed
Fix gradle rust android plugin
1 parent dfc069c commit c5bb87e

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

android/app/build.gradle.kts

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath
2424
val extraAssetsDirectory = layout.buildDirectory.dir("extraAssets").get()
2525
val relayListPath = extraAssetsDirectory.file("relays.json").asFile
2626
val defaultChangelogAssetsDirectory = "$repoRootPath/android/src/main/play/release-notes/"
27+
val rustJniLibsDir = layout.buildDirectory.dir("rustJniLibs/android").get()
2728

2829
val credentialsPath = "${rootProject.projectDir}/credentials"
2930
val keystorePropertiesFile = file("$credentialsPath/keystore.properties")
@@ -239,7 +240,10 @@ android {
239240
tasks["merge${capitalizedVariantName}Assets"].dependsOn(tasks["generateRelayList"])
240241

241242
// Ensure that we have all the JNI libs before merging them.
242-
tasks["merge${capitalizedVariantName}JniLibFolders"].dependsOn("cargoBuild")
243+
tasks["merge${capitalizedVariantName}JniLibFolders"].apply {
244+
inputs.dir(rustJniLibsDir)
245+
dependsOn("cargoBuild")
246+
}
243247

244248
// Ensure all relevant assemble tasks depend on our ensure task.
245249
tasks["assemble$capitalizedVariantName"].dependsOn(tasks["ensureValidVersionCode"])

0 commit comments

Comments
 (0)