copy assets, fix #329

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -594,8 +594,7 @@ public File exportProject() throws IOException, SketchException {
       Preferences.set("android.export.build_system", buildSystem);
     }
 
-    this.target = "debug";
-    
+    this.target = "debug";    
     String targetID = getTargetID();
 
     if (appComponent == WATCHFACE) {
@@ -1229,21 +1228,21 @@ private void writeResXMLWatchFace(final File xmlFolder) {
   }
 
 
-  private String generatePermissionsString(final String[] permissions) {
-    String permissionsStr = "";
-    for (String p: permissions) {
-      permissionsStr += (0 < permissionsStr.length() ? "," : "");
-      if (p.indexOf("permission") == -1) {
-        permissionsStr += "Manifest.permission." + p;
-      } else if (p.indexOf("Manifest.permission") == 0) {
-        permissionsStr += p;
-      } else {
-        permissionsStr += "\"" + p + "\"";
-      }
-    }
-    permissionsStr = "{" + permissionsStr + "}";   
-    return permissionsStr;
-  }
+//  private String generatePermissionsString(final String[] permissions) {
+//    String permissionsStr = "";
+//    for (String p: permissions) {
+//      permissionsStr += (0 < permissionsStr.length() ? "," : "");
+//      if (p.indexOf("permission") == -1) {
+//        permissionsStr += "Manifest.permission." + p;
+//      } else if (p.indexOf("Manifest.permission") == 0) {
+//        permissionsStr += p;
+//      } else {
+//        permissionsStr += "\"" + p + "\"";
+//      }
+//    }
+//    permissionsStr = "{" + permissionsStr + "}";   
+//    return permissionsStr;
+//  }
 
 
   /**
@@ -1409,11 +1408,13 @@ private void createAppModule(File projectFolder, File exportFolder, String build
     File mainFolder = mkdirs(moduleFolder, "src/main");
     File javaFolder = mkdirs(mainFolder, "java");
     File resFolder = mkdirs(mainFolder, "res");
+    File assetsFolder = mkdirs(mainFolder, "assets");
 
     Util.copyFile(new File(projectFolder, "AndroidManifest.xml"), 
                   new File(mainFolder, "AndroidManifest.xml"));
     Util.copyDir(new File(projectFolder, "res"), resFolder);
-    Util.copyDir(new File(projectFolder, "src"), javaFolder);    
+    Util.copyDir(new File(projectFolder, "src"), javaFolder);
+    Util.copyDir(new File(projectFolder, "assets"), assetsFolder);
   }
 
   private void createMobileModule(File projectFolder, File exportFolder, String buildToolsVer) 
@@ -1439,7 +1440,7 @@ private void createMobileModule(File projectFolder, File exportFolder, String bu
 
     File mainFolder = mkdirs(moduleFolder, "src/main");
     File javaFolder = mkdirs(mainFolder, "java");
-    File resFolder = mkdirs(mainFolder, "res");
+    File resFolder = mkdirs(mainFolder, "res");    
 
     Util.copyFile(new File(projectFolder, "AndroidManifest.xml"), 
                   new File(mainFolder, "AndroidManifest.xml"));
@@ -1475,6 +1476,7 @@ private void createWearModule(File projectFolder, File exportFolder, String buil
     File mainFolder = mkdirs(moduleFolder, "src/main");
     File javaFolder = mkdirs(mainFolder, "java");
     File resFolder = mkdirs(mainFolder, "res");
+    File assetsFolder = mkdirs(mainFolder, "assets");
 
     Util.copyFile(new File(projectFolder, "AndroidManifest.xml"), 
                   new File(mainFolder, "AndroidManifest.xml"));
@@ -1548,10 +1550,10 @@ private void copyAppCompatLib(String targetID, File tmpFolder, File libsFolder)
     ////////////////////////////////////////////////////////////////////////
     // third step: reference library projects from main project        
     if (appCompatRes) {
-      System.out.println("Library project created succesfully in " + libsFolder.toString());
+//      System.out.println("Library project created succesfully in " + libsFolder.toString());
       appCompatRes = referenceLibraryProject(targetID, tmpFolder.getAbsolutePath(), "libs/appcompat");
       if (appCompatRes) {
-        System.out.println("Library project referenced succesfully!");
+//        System.out.println("Library project referenced succesfully!");
         // Finally, re-write the build files so they use org.eclipse.jdt.core.JDTCompilerAdapter
         // instead of com.sun.tools.javac.Main
         // TODO: use the build file generated by the android tools, and