Commit b827102a authored by brizental's avatar brizental Committed by brizental
Browse files

fixup! [android] Modify build system 

Bug 44898: Remove our custom handling of NIMBUS_FML environment variable in favour of upstream's.
parent 1676ad67

mobile/android/fenix/app/build.gradle

+0 −6
Original line number Diff line number Diff line
@@ -291,18 +291,12 @@ androidComponents { 
    onVariants(selector().all()) { variant ->

        def buildType = variant.buildType



        // When this is set, a-s doesn't attempt to download NIMBUS_FML.

        if (gradle.mozconfig.substs.NIMBUS_FML) {

            System.setProperty("nimbusFml",  gradle.mozconfig.substs.NIMBUS_FML)

        }



        def disableTor = providers.gradleProperty("disableTor").getOrElse(false)



        project.logger.debug("----------------------------------------------")

        project.logger.debug("Variant name:      " + variant.name)

        project.logger.debug("Build type:        " + buildType)

        project.logger.debug("Flavor:            " + variant.flavorName)

        project.logger.debug("nimbusFml:         " + providers.gradleProperty("nimbusFml").getOrNull())

        project.logger.debug("Tor is disabled:   " + disableTor)



        variant.buildConfigFields.put("DISABLE_TOR", new BuildConfigField("boolean", "$disableTor", null))