Merge pull request #3367 from NativeScript/plamen5kov/update-find-apk-logic

refactor: add logic for finding apk name

Author: Plamen5kov

lib/services/android-project-service.ts

@@ -82,14 +82,15 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				platformProjectService: this,
 				emulatorServices: this.$androidEmulatorServices,
 				projectRoot: projectRoot,
-				deviceBuildOutputPath: path.join(...deviceBuildOutputArr),
+				deviceBuildOutputPath: this.getDeviceBuildOutputPath(path.join(...deviceBuildOutputArr), projectData),
 				getValidPackageNames: (buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[] => {
 					const buildMode = buildOptions.isReleaseBuild ? Configurations.Release.toLowerCase() : Configurations.Debug.toLowerCase();
 
 					return [
 						`${packageName}-${buildMode}.apk`,
 						`${projectData.projectName}-${buildMode}.apk`,
-						`${projectData.projectName}.apk`
+						`${projectData.projectName}.apk`,
+						`app-${buildMode}.apk`
 					];
 				},
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],
@@ -104,6 +105,22 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return this._platformData;
 	}
 
+	private getDeviceBuildOutputPath(currentPath: string, projectData: IProjectData): string {
+		const currentPlatformData: IDictionary<any> = this.$projectDataService.getNSValue(projectData.projectDir, constants.TNS_ANDROID_RUNTIME_NAME);
+		const platformVersion = currentPlatformData && currentPlatformData[constants.VERSION_STRING];
+		const normalizedPath = path.join(currentPath, "debug");
+
+		if (semver.valid(platformVersion)) {
+			const gradleAndroidPluginVersion3xx = "4.0.0";
+			const normalizedPlatformVersion = `${semver.major(platformVersion)}.${semver.minor(platformVersion)}.0`;
+			if (semver.lt(normalizedPlatformVersion, gradleAndroidPluginVersion3xx)) {
+				return currentPath;
+			}
+		}
+
+		return normalizedPath;
+	}
+
 	// TODO: Remove prior to the 4.0 CLI release @Pip3r4o @PanayotCankov
 	// Similar to the private method of the same name in platform-service.
 	private getCurrentPlatformVersion(platformData: IPlatformData, projectData: IProjectData): string {