Fixed symlink add features

mullvad · Dec 6, 2024 · 23e5bc5 · 23e5bc5
1 parent 7ecf272
commit 23e5bc5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -253,14 +253,17 @@ junitPlatform {
 }
 
 cargo {
+    val isReleaseBuild = isReleaseBuild()
     module = repoRootPath
     libname = "mullvad-jni"
     // All available targets:
     // https://github.com/mozilla/rust-android-gradle/tree/master?tab=readme-ov-file#targets
-    targets = gradleLocalProperties(rootProject.projectDir, providers)
-            .getProperty("CARGO_TARGETS")?.split(",") ?: listOf("arm", "arm64", "x86", "x86_64")
+    targets =
+        gradleLocalProperties(rootProject.projectDir, providers)
+            .getProperty("CARGO_TARGETS")
+            ?.split(",") ?: listOf("arm", "arm64", "x86", "x86_64")
     profile =
-        if (isReleaseBuild()) {
+        if (isReleaseBuild) {
             "release"
         } else {
             "debug"
@@ -270,8 +273,21 @@ cargo {
     // Set this if you get a cargo not found error
     // rustcCommand = ""
     // cargoCommand = ""
-    targetIncludes = listOf("libmullvad_jni.so").toTypedArray()
-    extraCargoBuildArguments = listOf("--package=mullvad-jni")
+    features {
+        if (!isReleaseBuild) {
+            defaultAnd(arrayOf("api-override"))
+        }
+    }
+    targetIncludes = arrayOf("libmullvad_jni.so")
+    extraCargoBuildArguments = buildList {
+        add("--package=mullvad-jni")
+        if (isReleaseBuild) {
+            add("--locked")
+        }
+    }
+    exec = { spec, toolchain ->
+        println(spec.commandLine)
+    }
 }
 
 tasks.register<Exec>("generateRelayList") {
@@ -281,9 +297,7 @@ tasks.register<Exec>("generateRelayList") {
     // Set this if you get a cargo not found error
     // environment =
 
-    onlyIf {
-        isReleaseBuild() || !relayListPath.exists()
-    }
+    onlyIf { isReleaseBuild() || !relayListPath.exists() }
 
     commandLine("cargo", "run", "--bin", "relay_list")
 

diff --git a/android/app/src/main/assets/maybenot_machines b/android/app/src/main/assets/maybenot_machines
@@ -1 +1 @@
-../dist-assets/maybenot_machines
+../../../../../dist-assets/maybenot_machines
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../dist-assets/maybenot_machines
		../../../../../dist-assets/maybenot_machines