rename plugin name directory to the flavor name

fixes merging of flavor provided AndroidManifest and resources

Author: blagoev

build/project-template-gradle/build.gradle

@@ -305,6 +305,18 @@ def updateIncludeGradleFile(targetFile, dimensionName, flavor)
 	fileEntry.text = replacedContent;
 }
 
+def renamePluginDirToFlavorName(directory, flavor) 
+{
+    def parentName = directory.getName();
+    def parentFile = new File("src", parentName);
+    if (parentFile.exists())
+    {
+        def targetDirName = new File("src", flavor);
+        println "Renaming plugin directory to flavor name: ${parentFile.getAbsolutePath()} -> ${targetDirName.getAbsolutePath()}";
+        parentFile.renameTo(targetDirName);
+    }    
+}
+
 def flavorNumber = 0
 
 task createDefaultIncludeFiles {
@@ -328,13 +340,15 @@ task createDefaultIncludeFiles {
 				if(subFile.name == "include.gradle") {
 					foundIncludeFile = true
 					updateIncludeGradleFile(subFile, dimensionName, flavor)
+					renamePluginDirToFlavorName(subFile.getParentFile(), flavor);
 				}
 			}
 
 			flavorNames.add('"' + dimensionName + '"')
 
 			if(!foundIncludeFile) {
 				createIncludeFile(fl.getAbsolutePath() , flavor, dimensionName)
+				renamePluginDirToFlavorName(fl, flavor);
 			}
 		}
 	}