From 05b4b35393461989a3490ebb36a2ce8bb542e0c4 Mon Sep 17 00:00:00 2001 From: Joshua Gerrard Date: Wed, 11 Nov 2015 17:32:50 +0000 Subject: [PATCH] Added workaround for Android Studio bug regarding .idea folder missing --- .../jucer_ProjectExport_AndroidStudio.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h index cfe2274910..74b32a9fa7 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h @@ -84,10 +84,21 @@ public: Value getNDKPlatformVersionValue() { return getSetting (Ids::androidNdkPlatformVersion); } String getNDKPlatformVersionString() const { return settings [Ids::androidNdkPlatformVersion]; } + void removeOldFiles (const File& targetFolder) const + { + targetFolder.getChildFile ("app/src").deleteRecursively(); + targetFolder.getChildFile ("app/build").deleteRecursively(); + targetFolder.getChildFile ("app/build.gradle").deleteFile(); + targetFolder.getChildFile ("gradle").deleteRecursively(); + targetFolder.getChildFile ("local.properties").deleteFile(); + targetFolder.getChildFile ("settings.gradle").deleteFile(); + } + void create (const OwnedArray& modules) const override { const File targetFolder (getTargetFolder()); - targetFolder.deleteRecursively(); + + removeOldFiles (targetFolder); { const String package (getActivityClassPackage());