diff options
| -rw-r--r-- | android/app/build.gradle.kts | 4 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Utils.kt | 19 |
2 files changed, 7 insertions, 16 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 5bd78f7906..0e1f9ffa62 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -292,9 +292,7 @@ cargo { } } exec = { spec, _ -> - val remaps = generateRemapArguments() - println("rustc path prefix remaps: $remaps") - spec.environment("RUSTFLAGS", remaps) + spec.environment("RUSTFLAGS", generateRemapArguments()) } } diff --git a/android/buildSrc/src/main/kotlin/Utils.kt b/android/buildSrc/src/main/kotlin/Utils.kt index 5c70b6f290..af00586bea 100644 --- a/android/buildSrc/src/main/kotlin/Utils.kt +++ b/android/buildSrc/src/main/kotlin/Utils.kt @@ -16,18 +16,11 @@ fun Project.generateRemapArguments(): String { } 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() |