Merge branch 'master' into StudioProjectCompat

This commit is contained in:
Joe Bowser 2017-11-27 11:42:25 -08:00
commit 30c3713dca

View File

@ -177,21 +177,34 @@ android {
flavorDimensions "default"
productFlavors {
armeabi {
versionCode defaultConfig.versionCode*10 + 1
ndk {
abiFilters = ["armeabi"]
}
}
armv7 {
versionCode defaultConfig.versionCode*10 + 2
ndk {
abiFilters "armeabi-v7a", ""
abiFilters = ["armeabi-v7a"]
}
}
arm64 {
versionCode defaultConfig.versionCode*10 + 3
ndk {
abiFilters = ["arm64-v8a"]
}
}
x86 {
versionCode defaultConfig.versionCode*10 + 4
ndk {
abiFilters "x86", ""
abiFilters = ["x86"]
}
}
all {
x86_64 {
versionCode defaultConfig.versionCode*10 + 5
ndk {
abiFilters "all", ""
abiFilters = ["x86_64"]
}
}
}
@ -205,8 +218,7 @@ android {
if (cdvReleaseSigningPropertiesFile) {
signingConfigs {
release {
// These must be set or Gradle will complain (even if they are overridden).
keyAlias = ""
// These must be set or Gradle will complain (even if they are overridden). keyAlias = ""
keyPassword = "__unset" // And these must be set to non-empty in order to have the signing step added to the task graph.
storeFile = null
storePassword = "__unset"