boklm pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 3c502c6e by Nicolas Vigier at 2026-03-03T11:23:14+01:00 fixup! TB 42669: [android] Use custom no-op app-services TB 44690: remove nimbus handling code as it's changed in moz - - - - - 2 changed files: - mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy - mobile/android/moz.configure Changes: ===================================== mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy ===================================== @@ -23,6 +23,12 @@ 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 @@ -148,6 +154,17 @@ 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 ===================================== mobile/android/moz.configure ===================================== @@ -233,8 +233,8 @@ def check_host_bin_prog(var, prog, toolchain=None): ) -check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen") # tb-44669 - this was added in rebase 148 to make android compile but tracking potentially better fix +#check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen") #check_host_bin_prog("NIMBUS_FML", "nimbus-fml") project_flag( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3c502c6e... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3c502c6e... You're receiving this email because of your account on gitlab.torproject.org.