Merge pull request #517 from irealva/master

Adds support for tensorflowlite

Author: codeanticode

mode/src/processing/mode/android/AndroidBuild.java

@@ -400,7 +400,7 @@ private void createAppModule(String moduleName)
 
     // Copy any imported libraries (their libs and assets),
     // and anything in the code folder contents to the project.
-    copyImportedLibs(libsFolder, assetsFolder);
+    copyImportedLibs(libsFolder, mainFolder, assetsFolder);
     copyCodeFolder(libsFolder);
 
     // Copy any system libraries needed by the project
@@ -915,7 +915,8 @@ protected boolean ignorableImport(String pkg) {
    * For each library, copy .jar and .zip files to the 'libs' folder,
    * and copy anything else to the 'assets' folder.
    */
-  private void copyImportedLibs(final File libsFolder,
+  private void copyImportedLibs(final File libsFolder, 
+                                final File mainFolder,
                                 final File assetsFolder) throws IOException {
     for (Library library : getImportedLibraries()) {
       // add each item from the library folder / export list to the output
@@ -937,7 +938,12 @@ private void copyImportedLibs(final File libsFolder,
               exportName.equals("armeabi-v7a") ||
               exportName.equals("x86")) {
             Util.copyDir(exportFile, new File(libsFolder, exportName));
-          } else {
+          }
+          // Copy jni libraries (.so files) to the correct location
+          else if (exportName.equals("jniLibs")) {
+            Util.copyDir(exportFile, new File(mainFolder, exportName));
+          }
+          else {
             // Copy any other directory to the assets folder
             Util.copyDir(exportFile, new File(assetsFolder, exportName));
           }

mode/templates/AppBuild.gradle.tmpl

@@ -26,7 +26,11 @@ android {
     }
     lintOptions {
         abortOnError false
-    }     
+    }   
+    aaptOptions {
+        noCompress "tflite"
+        noCompress "lite"
+    }  
 }
 
 dependencies {

mode/templates/AppBuildECJ.gradle.tmpl

@@ -26,7 +26,11 @@ android {
     }
     lintOptions {
         abortOnError false
-    }    
+    }  
+    aaptOptions {
+        noCompress "tflite"
+        noCompress "lite"
+    }  
 
     // We create a variant of the compile task, where we use the Eclipse Compiler for Java
     // (ECJ) instead of the JDK (which would require the user to download and install

mode/templates/VRBuild.gradle.tmpl

@@ -24,6 +24,10 @@ android {
     }
     lintOptions {
         abortOnError false
+    }
+    aaptOptions {
+        noCompress "tflite"
+        noCompress "lite"
     }    
 }
 

mode/templates/VRBuildECJ.gradle.tmpl

@@ -24,6 +24,10 @@ android {
     }
     lintOptions {
         abortOnError false
+    }
+    aaptOptions {
+        noCompress "tflite"
+        noCompress "lite"
     }    
 
     // We create a variant of the compile task, where we use the Eclipse Compiler for Java

mode/templates/WearBuild.gradle.tmpl

@@ -24,6 +24,10 @@ android {
     }
     lintOptions {
         abortOnError false
+    }
+    aaptOptions {
+        noCompress "tflite"
+        noCompress "lite"
     }    
 }
 

mode/templates/WearBuildECJ.gradle.tmpl

@@ -24,6 +24,10 @@ android {
     }
     lintOptions {
         abortOnError false
+    }
+    aaptOptions {
+        noCompress "tflite"
+        noCompress "lite"
     }    
 
     // We create a variant of the compile task, where we use the Eclipse Compiler for Java