mirror of
https://github.com/fork-maintainers/iceraven-browser
synced 2024-11-11 13:11:01 +00:00
Use armeabi-v7a version code for MozillaOnline builds
(cherry picked from commit f88be38796
)
This commit is contained in:
parent
6daec4a24f
commit
0c6bb72948
@ -263,12 +263,15 @@ android.applicationVariants.all { variant ->
|
|||||||
println("versionName override: $versionName")
|
println("versionName override: $versionName")
|
||||||
|
|
||||||
variant.outputs.each { output ->
|
variant.outputs.each { output ->
|
||||||
|
def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
|
||||||
def abi = output.getFilter(OutputFile.ABI)
|
def abi = output.getFilter(OutputFile.ABI)
|
||||||
|
// If it is a Mozilla Online build, use a unified version code of armeabi-v7a
|
||||||
|
def arch = (isMozillaOnline) ? "armeabi-v7a" : abi
|
||||||
// We use the same version code generator, that we inherited from Fennec, across all channels - even on
|
// We use the same version code generator, that we inherited from Fennec, across all channels - even on
|
||||||
// channels that never shipped a Fennec build.
|
// channels that never shipped a Fennec build.
|
||||||
def versionCodeOverride = Config.generateFennecVersionCode(abi)
|
def versionCodeOverride = Config.generateFennecVersionCode(arch)
|
||||||
|
|
||||||
println("versionCode for $abi = $versionCodeOverride")
|
println("versionCode for $abi = $versionCodeOverride, isMozillaOnline = $isMozillaOnline")
|
||||||
|
|
||||||
output.versionNameOverride = versionName
|
output.versionNameOverride = versionName
|
||||||
output.versionCodeOverride = versionCodeOverride
|
output.versionCodeOverride = versionCodeOverride
|
||||||
|
Loading…
Reference in New Issue
Block a user