Verified Commit 760924b2 authored by boklm's avatar boklm Committed by jwilde
Browse files

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

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

mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/kotlin/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.kt

+16 −0
Changes for mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/kotlin/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.kt: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ import java.net.URI 
import java.security.MessageDigest

import javax.inject.Inject



import java.nio.file.Files

import java.nio.file.Path

import java.nio.file.Paths

import java.nio.file.StandardCopyOption



/**

 * A task that fetches a prebuilt `nimbus-fml` binary for the current platform.

 *
@@ -113,6 +118,17 @@ abstract class NimbusAssembleToolsTask : DefaultTask() { 


    @TaskAction

    fun assembleTools() {

        var nimbusFml = System.getenv("NIMBUS_FML") ?: ""

        if (nimbusFml == "") {

            nimbusFml = System.getProperty("nimbusFml", "")

        }

        if (nimbusFml != "") {

            val source = File(nimbusFml).toPath()

            val dest = fmlBinary.get().asFile.toPath()

            Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING)

            return

        }



        val binaryFile = fmlBinary.get().asFile

        val archiveFileObj = archiveFile.get().asFile

        val hashFileObj = hashFile.get().asFile

mobile/android/moz.configure

+1 −1
Changes for mobile/android/moz.configure: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -231,8 +231,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(