Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
For #20881 print if the build is a MozillaOnline
Browse files Browse the repository at this point in the history
  • Loading branch information
Amejia481 authored and mergify[bot] committed Sep 8, 2021
1 parent 64f5e85 commit dd1fb24
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dd1fb24

Please sign in to comment.