Verified Commit 41830df8 authored by Georg Koppen's avatar Georg Koppen Committed by Pier Angelo Vendrame
Browse files

Modify build system 

Bug 40083: Make locale ordering in BuildConfig deterministic

Bug 40042: Add option do overwrite timestamp in extension version

Bug 40059: Use MOZ_BUILD_DATE for versionCode

At the same time we adapt MOZ_BUILD_DATE to our needs where it is
actually used and not in tor-browser-build. This gives us more
flexibility. See: tor-browser-build#40084.

Bug 40067: Fix reproducibility issue in classes2.dex

We make sure our MOZ_BUILD_DATE gets used as a source for showing date
related information on the Fenix about page.

Bug 40071: Show only supported locales

Bug 40064: Use Gecko Beta for Nightly and Debug variants

Bug 40123: Allow building the instrumented tests apks for variants other than debug

This allows to specify the variant of the instrumented tests via
a `testBuildType` gradle argument. It also applies a workaround for
a R8 issue from https://issuetracker.google.com/issues/140851070.

Bug 40143: Use deterministic date in Test apk

The build config was using Date() when generating the Test apk's
versionName.
parent 9cb478b0

app/build.gradle

+25 −4
Original line number Diff line number Diff line
@@ -23,7 +23,16 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType 


apply from: 'benchmark.gradle'



def obtainTestBuildType() {

    def result = "debug";

    if (project.hasProperty("testBuildType")) {

        result = project.getProperties().get("testBuildType")

    }

    result

}



android {

    testBuildType obtainTestBuildType()

    compileSdkVersion Config.compileSdkVersion



    project.maybeConfigForJetpackBenchmark(it)
@@ -749,16 +758,22 @@ task buildTranslationArray { 
    // This isn't running as a task, instead the array is build when the gradle file is parsed.

    // https://github.com/mozilla-mobile/fenix/issues/14175

    def foundLocales = new StringBuilder()

    def languageCodes = []

    foundLocales.append("new String[]{")



    fileTree("src/main/res").visit { FileVisitDetails details ->

        if(details.file.path.endsWith("${File.separator}strings.xml")){

        if(details.file.path.endsWith("${File.separator}torbrowser_strings.xml")){

            def languageCode = details.file.parent.tokenize(File.separator).last().replaceAll('values-','').replaceAll('-r','-')

            languageCode = (languageCode == "values") ? "en-US" : languageCode

            foundLocales.append("\"").append(languageCode).append("\"").append(",")

            languageCodes.add(languageCode)

        }

    }



    // The order of files in a `FileTree` is not stable, even on a single

    // computer. Thus we need to sort the `languageCode`s. See: fenix#40083.

    languageCodes.sort()

    languageCodes.each {

        foundLocales.append("\"").append(it).append("\"").append(",")

    }

    foundLocales.append("}")

    def foundLocalesString = foundLocales.toString().replaceAll(',}','}')

    android.defaultConfig.buildConfigField "String[]", "SUPPORTED_LOCALE_ARRAY", foundLocalesString
@@ -864,7 +879,13 @@ ext.updateExtensionVersion = { task, extDir -> 
        rename { 'manifest.json' }

        into extDir



        def values = ['version': AndroidComponents.VERSION + "." + new Date().format('MMddHHmmss')]

        def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE')

        // MOZ_BUILD_DATE is in the yyyyMMddHHmmss format. Thus, we only use a

        // substring of it if it is available.

        def values = ['version': AndroidComponents.VERSION + "." +

                      (systemEnvBuildDate != null ?

                       systemEnvBuildDate.substring(4) :

                       new Date().format('MMddHHmmss'))]

        inputs.properties(values)

        expand(values)

    }

app/proguard-rules.pro

+3 −0
Original line number Diff line number Diff line
@@ -124,3 +124,6 @@ 
# Keep Android Lifecycle methods

# https://bugzilla.mozilla.org/show_bug.cgi?id=1596302

-keep class androidx.lifecycle.** { *; }



# Workaround for 'already has mapping' r8 issue (https://issuetracker.google.com/issues/140851070)

-keep class com.google.android.gms.common.internal.BaseGmsClient { *; }

buildSrc/src/main/java/Config.kt

+15 −3
Original line number Diff line number Diff line
@@ -17,7 +17,12 @@ object Config { 


    @JvmStatic

    private fun generateDebugVersionName(): String {

        val today = Date()

        val today = if (System.getenv("MOZ_BUILD_DATE") != null) {

            val format = SimpleDateFormat("yyyyMMddHHmmss", Locale.US)

            format.parse(System.getenv("MOZ_BUILD_DATE"))

        } else {

            Date()

        }

        // Append the year (2 digits) and week in year (2 digits). This will make it easier to distinguish versions and

        // identify ancient versions when debugging issues. However this will still keep the same version number during

        // the week so that we do not end up with a lot of versions in tools like Sentry. As an extra this matches the
@@ -59,13 +64,20 @@ object Config { 
     */

    @JvmStatic

    fun generateBuildDate(): String {

        return LocalDateTime.now().toString()

        return if (System.getenv("MOZ_BUILD_DATE") != null) {

          // Converting our MOZ_BUILD_DATE to LocalDateTime

          val format = SimpleDateFormat("yyyyMMddHHmmss", Locale.US)

          val date = format.parse(System.getenv("MOZ_BUILD_DATE"))

          java.sql.Timestamp(date.getTime()).toLocalDateTime().toString()

        } else {

          LocalDateTime.now().toString()

        }

    }



    private val fennecBaseVersionCode by lazy {

        val format = SimpleDateFormat("yyyyMMddHHmmss", Locale.US)

        val cutoff = format.parse("20141228000000")

        val build = Date()

        val build = if (System.getenv("MOZ_BUILD_DATE") != null) format.parse(System.getenv("MOZ_BUILD_DATE")) else Date()



        Math.floor((build.time - cutoff.time) / (1000.0 * 60.0 * 60.0)).toInt()

    }