Verified Commit 62ff8bfc authored by boklm's avatar boklm
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 b20da978

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

+17 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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(