2 files changed, 23 insertions, 8 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 26db17f1bb..5bd78f7906 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -291,6 +291,11 @@ cargo {
             add("--locked")
         }
     }
+    exec = { spec, _ ->
+        val remaps = generateRemapArguments()
+        println("rustc path prefix remaps: $remaps")
+        spec.environment("RUSTFLAGS", remaps)
+    }
 }
 
 tasks.register<Exec>("generateRelayList") {
diff --git a/android/buildSrc/src/main/kotlin/Utils.kt b/android/buildSrc/src/main/kotlin/Utils.kt
index ffea7ce51f..5c70b6f290 100644
--- a/android/buildSrc/src/main/kotlin/Utils.kt
+++ b/android/buildSrc/src/main/kotlin/Utils.kt
@@ -1,7 +1,5 @@
-import java.io.ByteArrayOutputStream
 import java.util.*
 import org.gradle.api.Project
-import org.gradle.process.ExecSpec
 
 fun Project.generateVersionCode(localProperties: Properties): Int {
     return localProperties.getProperty("OVERRIDE_VERSION_CODE")?.toIntOrNull()
@@ -12,12 +10,24 @@ fun Project.generateVersionName(localProperties: Properties): String {
     return localProperties.getProperty("OVERRIDE_VERSION_NAME") ?: execVersionNameCargoCommand()
 }
 
+fun Project.generateRemapArguments(): String {
+    val script = "${projectDir.parent}/../building/rustc-remap-path-prefix.sh"
+    return providers.exec { commandLine(script) }.standardOutput.asText.get().trim()
+}
+
 private fun Project.execVersionCodeCargoCommand() =
-    providers.exec {
-        commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionCode")
-    }.standardOutput.asText.get().trim().toInt()
+    providers
+        .exec { commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionCode") }
+        .standardOutput
+        .asText
+        .get()
+        .trim()
+        .toInt()
 
 private fun Project.execVersionNameCargoCommand() =
-    providers.exec {
-        commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionName")
-    }.standardOutput.asText.get().trim()
+    providers
+        .exec { commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionName") }
+        .standardOutput
+        .asText
+        .get()
+        .trim()