From 2e812542fae9dc065af3da093536936d4c54bf02 Mon Sep 17 00:00:00 2001 From: plamen5kov Date: Mon, 10 Oct 2016 17:41:56 +0300 Subject: [PATCH 1/2] make sure we warn the user if there is no app folder instead of crash --- lib/services/android-project-service.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts index 16088ce9df..618d010985 100644 --- a/lib/services/android-project-service.ts +++ b/lib/services/android-project-service.ts @@ -313,6 +313,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject return (() => { let originalAndroidManifestFilePath = path.join(this.$projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.Android, this.platformData.configurationFileName); + let manifestExists = this.$fs.exists(originalAndroidManifestFilePath).wait(); + if(!manifestExists) { + this.$logger.warn('No manifest found in ' + originalAndroidManifestFilePath); + return; + } // Overwrite the AndroidManifest from runtime. this.$fs.copyFile(originalAndroidManifestFilePath, this.platformData.configurationFilePath).wait(); }).future()(); From b17dd37d5f294583571001112086889fb38af92d Mon Sep 17 00:00:00 2001 From: plamen5kov Date: Tue, 11 Oct 2016 09:08:55 +0300 Subject: [PATCH 2/2] updated lib/common submodule --- lib/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common b/lib/common index 35330ab7a7..cd060a4537 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit 35330ab7a7146ac9427051ffde5d65c1391602f3 +Subproject commit cd060a4537a99c34c5c71217ff162773439118ef