Merge pull request #768 from betheg/as

gradle: fix Cannot set property outputFile on null object.
This commit is contained in:
Daniel Gultsch 2014-12-09 20:14:56 +01:00
commit 135563e941
1 changed files with 3 additions and 1 deletions

View File

@ -84,7 +84,9 @@ android {
applicationVariants.all { variant -> applicationVariants.all { variant ->
if (variant.name.equals('release')) { if (variant.name.equals('release')) {
variant.outputs.each { output -> variant.outputs.each { output ->
if (output.zipAlign != null) {
output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk") output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk")
}
output.packageApplication.outputFile = new File(output.outputFile.parent, output.packageApplication.outputFile.name output.packageApplication.outputFile = new File(output.outputFile.parent, output.packageApplication.outputFile.name
.replace(".apk", "-${variant.versionName}.apk")) .replace(".apk", "-${variant.versionName}.apk"))
} }