For #20881 print if the build is a MozillaOnline

upstream-sync
Arturo Mejia 3 years ago committed by mergify[bot]
parent 64f5e85ddd
commit dd1fb24705

@ -263,14 +263,15 @@ android.applicationVariants.all { variant ->
println("versionName override: $versionName")
variant.outputs.each { output ->
def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
def abi = output.getFilter(OutputFile.ABI)
// If it is a Mozilla Online build, use a unified version code of armeabi-v7a
def arch = (project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")) ? "armeabi-v7a" : abi
def arch = (isMozillaOnline) ? "armeabi-v7a" : abi
// We use the same version code generator, that we inherited from Fennec, across all channels - even on
// channels that never shipped a Fennec build.
def versionCodeOverride = Config.generateFennecVersionCode(arch)
println("versionCode for $abi = $versionCodeOverride")
println("versionCode for $abi = $versionCodeOverride, isMozillaOnline = $isMozillaOnline")
output.versionNameOverride = versionName
output.versionCodeOverride = versionCodeOverride

Loading…
Cancel
Save