tor-browser

commit ba1e6b524398af22df14a5d29e25bed3d9554735
parent 2bbe0817a830a1fc243e255d090cba765c17372c
Author: Dan Ballard <dan@mindstab.net>
Date:   Tue, 24 Feb 2026 13:43:35 -0800

fixup! TB 42669: [android] Use custom no-op app-services

TB 44690: remove nimbus handling code as it's changed in moz

Diffstat:
M
mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy
 | 
17
-----------------
M
mobile/android/moz.configure
 | 
3
++-

2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy b/mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy
@@ -23,12 +23,6 @@ import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 
-import java.io.File
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.nio.file.StandardCopyOption
-
 import javax.inject.Inject
 import java.security.MessageDigest
 
@@ -154,17 +148,6 @@ abstract class NimbusAssembleToolsTask extends DefaultTask {
 
     @TaskAction
     void assembleTools() {
-        String nimbusFml = System.getenv("NIMBUS_FML")
-        if (nimbusFml == null || "".equals(nimbusFml)) {
-            nimbusFml = System.getProperty("nimbusFml")
-        }
-        if (nimbusFml != null && !"".equals(nimbusFml)) {
-            Path source = (new File(nimbusFml)).toPath()
-            Path dest = fmlBinary.get().asFile.toPath()
-            Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING)
-            return
-        }
-
         def binaryFile = fmlBinary.get().asFile
         def archiveFileObj = archiveFile.get().asFile
         def hashFileObj = hashFile.get().asFile
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
@@ -234,7 +234,8 @@ def check_host_bin_prog(var, prog, toolchain=None):
 
 
 check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen")
-check_host_bin_prog("NIMBUS_FML", "nimbus-fml")
+# tb-44669 - this was added in rebase 148 to make android compile but tracking potentially better fix
+#check_host_bin_prog("NIMBUS_FML", "nimbus-fml")
 
 project_flag(
     "MOZ_ANDROID_NETWORK_STATE",