Verified Commit fcd62e13 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! [android] Modify build system 

TB 43826: Drop an unneeded version customization.

When the patch was originally created
(android-components@abf37979), it
replaced a Date additions that prevented reproducible builds.

However, Mozilla themselves removed that Date in Bug 1824818, so we do
not need this part of the patch anymore.
parent b3883f7c

mobile/android/shared-settings.gradle

+1 −10
Original line number Diff line number Diff line
@@ -164,16 +164,7 @@ gradle.projectsLoaded { -> 
                rename { 'manifest.json' }

                into extDir



                // android-components#40013: overwrite the timestamp in

                // extension version to ensure build reproducibility. 

                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': rootProject.ext.config.componentsVersion + "." +

                        (systemEnvBuildDate != null ?

                                systemEnvBuildDate.substring(4) :

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



                def values = ['version': getManifestVersionString(rootProject.ext.config.componentsVersion)]

                inputs.properties(values)

                expand(values)

            }