Merge pull request #1405 from kiwix/hotfix/macgills/disable-density-splits

Disable density splits
This commit is contained in:
Seán Mac Gillicuddy 2019-09-09 10:48:14 +01:00 committed by GitHub
commit c2b8e60e1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -141,7 +141,7 @@ dependencies {
androidTestImplementation "io.mockk:mockk-android:1.9"
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
androidTestImplementation "org.assertj:assertj-core:3.11.1"
androidTestImplementation ("org.simpleframework:simple-xml:2.7.1"){
androidTestImplementation("org.simpleframework:simple-xml:2.7.1") {
exclude module: 'stax'
exclude module: 'stax-api'
exclude module: 'xpp3'
@ -277,7 +277,6 @@ android {
}
}
flavorDimensions "default"
signingConfigs {
@ -452,7 +451,7 @@ android {
universalApk true
}
density {
enable true
enable false
reset()
include "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"
}
@ -460,7 +459,7 @@ android {
applicationVariants.all { variant ->
variant.outputs.each { output ->
def baseAbiVersionCode = abiCodes.get(output.getFilter(OutputFile.ABI)) ?: 0
def baseDensityVersionCode = densityCodes.get(output.getFilter(OutputFile.DENSITY)) ?: 1
def baseDensityVersionCode = densityCodes.get(output.getFilter(OutputFile.DENSITY)) ?: 0
output.versionCodeOverride =
(baseDensityVersionCode * 10000000) +
(baseAbiVersionCode * 1000000) +