kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #828 from player-03/output-apk

Browse Source 
Make Gradle use the right APK filename.
This commit is contained in:
Joshua Granick
2016-10-17 12:43:58 -07:00
committed by GitHub
parent b6a895b7af 521a81ce8c
commit dc3f7e3d09
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lime/tools/platforms/AndroidPlatform.hx
View File

@@ -179,20 +179,17 @@ class AndroidPlatform extends PlatformTarget {
public override function install ():Void {
var build = "debug";
var build = "-debug";
if (project.certificate != null) {
build = "release";
build = "-release";
}
var apkPath = FileSystem.fullPath (targetDirectory) + "/bin/app/build/outputs/apk/";
var apkSuffix = "-" + build + ".apk";
var apkPath = FileSystem.fullPath (targetDirectory) + "/bin/app/build/outputs/apk/" + project.app.file + build + ".apk";
File.copy (apkPath + "app" + apkSuffix, apkPath + project.app.file + apkSuffix);
deviceID = AndroidHelper.install (project, apkPath + project.app.file + apkSuffix, deviceID);
deviceID = AndroidHelper.install (project, apkPath, deviceID);
}

10
templates/android/template/app/build.gradle
View File

@@ -48,6 +48,16 @@ android {
signingConfig signingConfigs.release
}
}
android.applicationVariants.all { variant ->
variant.outputs.each { output ->
def outputFile = output.outputFile
if (outputFile != null && outputFile.name.endsWith('.apk')) {
output.outputFile = new File(outputFile.parent, "::APP_FILE::-" + variant.buildType.name + ".apk")
}
}
}
}
dependencies {