mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-22 00:32:55 +08:00
Merge branch 'master' into StudioProjectCompat
This commit is contained in:
commit
30c3713dca
@ -177,21 +177,34 @@ android {
|
|||||||
flavorDimensions "default"
|
flavorDimensions "default"
|
||||||
|
|
||||||
productFlavors {
|
productFlavors {
|
||||||
|
armeabi {
|
||||||
|
versionCode defaultConfig.versionCode*10 + 1
|
||||||
|
ndk {
|
||||||
|
abiFilters = ["armeabi"]
|
||||||
|
}
|
||||||
|
}
|
||||||
armv7 {
|
armv7 {
|
||||||
versionCode defaultConfig.versionCode*10 + 2
|
versionCode defaultConfig.versionCode*10 + 2
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "armeabi-v7a", ""
|
abiFilters = ["armeabi-v7a"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
arm64 {
|
||||||
|
versionCode defaultConfig.versionCode*10 + 3
|
||||||
|
ndk {
|
||||||
|
abiFilters = ["arm64-v8a"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
x86 {
|
x86 {
|
||||||
versionCode defaultConfig.versionCode*10 + 4
|
versionCode defaultConfig.versionCode*10 + 4
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "x86", ""
|
abiFilters = ["x86"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
all {
|
x86_64 {
|
||||||
|
versionCode defaultConfig.versionCode*10 + 5
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "all", ""
|
abiFilters = ["x86_64"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -205,8 +218,7 @@ android {
|
|||||||
if (cdvReleaseSigningPropertiesFile) {
|
if (cdvReleaseSigningPropertiesFile) {
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
// These must be set or Gradle will complain (even if they are overridden).
|
// These must be set or Gradle will complain (even if they are overridden). keyAlias = ""
|
||||||
keyAlias = ""
|
|
||||||
keyPassword = "__unset" // And these must be set to non-empty in order to have the signing step added to the task graph.
|
keyPassword = "__unset" // And these must be set to non-empty in order to have the signing step added to the task graph.
|
||||||
storeFile = null
|
storeFile = null
|
||||||
storePassword = "__unset"
|
storePassword = "__unset"
|
||||||
|
Loading…
Reference in New Issue
Block a user