summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorKalle Lindström <karl.lindstrom@mullvad.net>2025-01-24 09:00:02 +0100
committerKalle Lindström <karl.lindstrom@mullvad.net>2025-01-24 09:00:02 +0100
commit205ba4726628c440f3ab3095ecf6bb55e898e784 (patch)
treecec5f7166a62f60b33e4e36d248b1e581a1462e1 /android
parent1a58706ffd5cb0702a1ba3281fd648deb9b6501e (diff)
downloadmullvadvpn-205ba4726628c440f3ab3095ecf6bb55e898e784.tar.xz
mullvadvpn-205ba4726628c440f3ab3095ecf6bb55e898e784.zip
Remove logging and formatting
Diffstat (limited to 'android')
-rw-r--r--android/app/build.gradle.kts4
-rw-r--r--android/buildSrc/src/main/kotlin/Utils.kt19
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()