[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! TB 42669: [android] Use custom no-op app-services

Title: GitLab

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:

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
    23 23 
     import org.gradle.api.tasks.OutputFile
    24 24 
     import org.gradle.api.tasks.TaskAction
    25 25
    26 
    +import java.io.File
    27 
    +import java.nio.file.Files
    28 
    +import java.nio.file.Path
    29 
    +import java.nio.file.Paths
    30 
    +import java.nio.file.StandardCopyOption
    31 
    +
    26 32 
     import javax.inject.Inject
    27 33 
     import java.security.MessageDigest
    28 34
    ... ... @@ -148,6 +154,17 @@ abstract class NimbusAssembleToolsTask extends DefaultTask {
    148 154
    149 155 
         @TaskAction
    150 156 
         void assembleTools() {
    157 
    +        String nimbusFml = System.getenv("NIMBUS_FML")
    158 
    +        if (nimbusFml == null || "".equals(nimbusFml)) {
    159 
    +            nimbusFml = System.getProperty("nimbusFml")
    160 
    +        }
    161 
    +        if (nimbusFml != null && !"".equals(nimbusFml)) {
    162 
    +            Path source = (new File(nimbusFml)).toPath()
    163 
    +            Path dest = fmlBinary.get().asFile.toPath()
    164 
    +            Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING)
    165 
    +            return
    166 
    +        }
    167 
    +
    151 168 
             def binaryFile = fmlBinary.get().asFile
    152 169 
             def archiveFileObj = archiveFile.get().asFile
    153 170 
             def hashFileObj = hashFile.get().asFile

  • mobile/android/moz.configure
    ... ... @@ -233,8 +233,8 @@ def check_host_bin_prog(var, prog, toolchain=None):
    233 233 
                 )
    234 234
    235 235
    236 
    -check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen")
    237 236 
     # tb-44669 - this was added in rebase 148 to make android compile but tracking potentially better fix
    237 
    +#check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen")
    238 238 
     #check_host_bin_prog("NIMBUS_FML", "nimbus-fml")
    239 239
    240 240 
     project_flag(

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3c502c6e6b6c8c7956d2ee9130e06e09e6620ed7 at 1772533619 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx