mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-18 03:45:33 -04:00
Merge pull request #1405 from kiwix/hotfix/macgills/disable-density-splits
Disable density splits
This commit is contained in:
commit
c2b8e60e1e
@ -141,7 +141,7 @@ dependencies {
|
|||||||
androidTestImplementation "io.mockk:mockk-android:1.9"
|
androidTestImplementation "io.mockk:mockk-android:1.9"
|
||||||
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
|
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
|
||||||
androidTestImplementation "org.assertj:assertj-core:3.11.1"
|
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'
|
||||||
exclude module: 'stax-api'
|
exclude module: 'stax-api'
|
||||||
exclude module: 'xpp3'
|
exclude module: 'xpp3'
|
||||||
@ -277,7 +277,6 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
flavorDimensions "default"
|
flavorDimensions "default"
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
@ -452,7 +451,7 @@ android {
|
|||||||
universalApk true
|
universalApk true
|
||||||
}
|
}
|
||||||
density {
|
density {
|
||||||
enable true
|
enable false
|
||||||
reset()
|
reset()
|
||||||
include "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"
|
include "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"
|
||||||
}
|
}
|
||||||
@ -460,7 +459,7 @@ android {
|
|||||||
applicationVariants.all { variant ->
|
applicationVariants.all { variant ->
|
||||||
variant.outputs.each { output ->
|
variant.outputs.each { output ->
|
||||||
def baseAbiVersionCode = abiCodes.get(output.getFilter(OutputFile.ABI)) ?: 0
|
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 =
|
output.versionCodeOverride =
|
||||||
(baseDensityVersionCode * 10000000) +
|
(baseDensityVersionCode * 10000000) +
|
||||||
(baseAbiVersionCode * 1000000) +
|
(baseAbiVersionCode * 1000000) +
|
||||||
|
Loading…
x
Reference in New Issue
Block a user