Skip to content

Commit 489c1e2

Browse files
Merge pull request #1053 from NativeScript/vladimirov/fix-no-apk
Use correct .apk name
2 parents 9199eda + c1d19fb commit 489c1e2

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

lib/services/android-project-service.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
3939
public get platformData(): IPlatformData {
4040
if (!this._platformData) {
4141
let projectRoot = path.join(this.$projectData.platformsDir, "android");
42-
42+
let packageName = this.getProjectNameFromId();
4343
this._platformData = {
4444
frameworkPackageName: "tns-android",
4545
normalizedPlatformName: "Android",
@@ -49,6 +49,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
4949
projectRoot: projectRoot,
5050
deviceBuildOutputPath: path.join(projectRoot, "build", "outputs", "apk"),
5151
validPackageNamesForDevice: [
52+
`${packageName}-debug.apk`,
53+
`${packageName}-release.apk`,
5254
`${this.$projectData.projectName}-debug.apk`,
5355
`${this.$projectData.projectName}-release.apk`
5456
],
@@ -143,11 +145,15 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
143145
shell.sed('-i', /__TITLE_ACTIVITY__/, this.$projectData.projectName, stringsFilePath);
144146

145147
let gradleSettingsFilePath = path.join(this.platformData.projectRoot, "settings.gradle");
146-
shell.sed('-i', /__PROJECT_NAME__/, this.$projectData.projectId.split(".")[2], gradleSettingsFilePath);
148+
shell.sed('-i', /__PROJECT_NAME__/, this.getProjectNameFromId(), gradleSettingsFilePath);
147149
shell.sed('-i', /__APILEVEL__/, this.$options.sdk || this.$androidToolsInfo.getToolsInfo().wait().compileSdkVersion.toString(), manifestPath);
148150
}).future<void>()();
149151
}
150152

153+
private getProjectNameFromId(): string {
154+
return this.$projectData.projectId.split(".")[2];
155+
}
156+
151157
public afterCreateProject(projectRoot: string): IFuture<void> {
152158
return Future.fromResult();
153159
}

0 commit comments

Comments
 (0)