diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-01-10 09:53:21 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-01-10 15:58:38 +0100 |
| commit | b37f519750498634f6f8d1cd5bc31e57d2aac0cb (patch) | |
| tree | bd50e157652075e066360ddbf035a132e636e175 | |
| parent | ef57eee494bb2e618191c9448882843fdeb85b2b (diff) | |
| download | mullvadvpn-b37f519750498634f6f8d1cd5bc31e57d2aac0cb.tar.xz mullvadvpn-b37f519750498634f6f8d1cd5bc31e57d2aac0cb.zip | |
Fix gradle rust android plugin
| -rw-r--r-- | .github/workflows/android-app.yml | 2 | ||||
| -rw-r--r-- | android/app/build.gradle.kts | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index a035439ead..14c7bc0e5a 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -402,6 +402,8 @@ jobs: ${{ matrix.assemble-command }} -x cargoBuild -x generateRelayList + -x mergeOssProdDebugJniLibFolders + -x mergePlayStagemoleDebugJniLibFolders gradle-version: wrapper build-root-directory: android execution-only-caches: false diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 024a5fba7f..9da8b23fe4 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -24,6 +24,7 @@ val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath val extraAssetsDirectory = layout.buildDirectory.dir("extraAssets").get() val relayListPath = extraAssetsDirectory.file("relays.json").asFile val defaultChangelogAssetsDirectory = "$repoRootPath/android/src/main/play/release-notes/" +val rustJniLibsDir = layout.buildDirectory.dir("rustJniLibs/android").get() val credentialsPath = "${rootProject.projectDir}/credentials" val keystorePropertiesFile = file("$credentialsPath/keystore.properties") @@ -239,7 +240,13 @@ android { tasks["merge${capitalizedVariantName}Assets"].dependsOn(tasks["generateRelayList"]) // Ensure that we have all the JNI libs before merging them. - tasks["merge${capitalizedVariantName}JniLibFolders"].dependsOn("cargoBuild") + tasks["merge${capitalizedVariantName}JniLibFolders"].apply { + // This is required for the merge task to run every time the .so files are updated. + // See this comment for more information: + // https://github.com/mozilla/rust-android-gradle/issues/118#issuecomment-1569407058 + inputs.dir(rustJniLibsDir) + dependsOn("cargoBuild") + } // Ensure all relevant assemble tasks depend on our ensure task. tasks["assemble$capitalizedVariantName"].dependsOn(tasks["ensureValidVersionCode"]) |