Pier Angelo Vendrame pushed to branch tor-browser-145.0a1-16.0-1 at The Tor
Project / Applications / Tor Browser
Commits:
576980eb by Pier Angelo Vendrame at 2025-11-26T13:20:27+01:00
fixup! TB 42669: [android] Use custom no-op app-services
TB 44360: Bring A-S's patch to NimbusAssembleToolsTask.groovy to Tor Browser.
Without this, the offline build in tor-browser-build fails because the
plugin tries to pull nimbus-fml from Mozilla's servers.
- - - - -
1 changed file:
-
mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy
Changes:
=====================================
mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy
=====================================
@@ -20,6 +20,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 groovy.transform.Immutable
@@ -84,6 +90,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 sources = [fetchSpec, *fetchSpec.fallbackSources.get()].collect {
new Source(new URI(it.archive.get()), new URI(it.hash.get()))
}
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/576980ebabb08c76a2f48d174ac523a5643cb86c
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/576980ebabb08c76a2f48d174ac523a5643cb86c
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
