added getZipAlignTool() method to AndroidSDK

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -329,9 +329,9 @@ protected void getImages(final ArrayList<String> images, final AndroidSDK sdk,
     // TODO : Find a better way to get the list of installed images
     ProcessBuilder pb = new ProcessBuilder(cmd);
 
-    //if (Base.DEBUG) {
-    System.out.println(processing.core.PApplet.join(cmd, " "));
-  //}    
+    if (Base.DEBUG) {
+      System.out.println(processing.core.PApplet.join(cmd, " "));
+    }
 
     Map<String, String> env = pb.environment();
     env.clear();
@@ -345,12 +345,12 @@ protected void getImages(final ArrayList<String> images, final AndroidSDK sdk,
       output.addTarget(new LineProcessor() {
         @Override
         public void processLine(String line) {
-          System.out.println("DUMMY ---> " + line);
+          System.out.println("dummy output ---> " + line);
           if (images != null && 
               line.contains(";" + imagePlatform) &&
               line.contains(";" + imageTag) &&
               line.contains(";" + imageAbi)) {
-            System.out.println("  added!");
+            System.out.println("  added image!");
             images.add(line);
           }
         }
@@ -402,9 +402,9 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 
     ProcessBuilder pb = new ProcessBuilder(cmd);
 
-    //if (Base.DEBUG) {
+    if (Base.DEBUG) {
       System.out.println(processing.core.PApplet.join(cmd, " "));
-    //}
+    }
 
     // avdmanager create avd -n "Wear-Processing-0254" -k "system-images;android-25;google_apis;x86" -c 64M
 

src/processing/mode/android/AndroidBuild.java

@@ -786,11 +786,8 @@ private File signPackage(File projectFolder, String keyStorePassword) throws Exc
 
   private File zipalignPackage(File signedPackage, File projectFolder) 
       throws IOException, InterruptedException {
-
-    File buildToolsFolder = new File(sdk.getSdkFolder(), "build-tools").listFiles()[0]; 
-    String zipalignPath = buildToolsFolder.getAbsolutePath() + "/zipalign";
-    if (Platform.isWindows()) zipalignPath += ".exe";    
-    if (!new File(zipalignPath).exists()) {
+    File zipAlign = sdk.getZipAlignTool();
+    if (zipAlign == null || !zipAlign.exists()) {
       Messages.showWarning("Cannot find zipaling...",
           "The zipalign build tool needed to prepare the export package is missing.\n" +
           "Make sure that your Android SDK was downloaded correctly.");
@@ -801,7 +798,7 @@ private File zipalignPackage(File signedPackage, File projectFolder)
         module + "/build/outputs/apk/" + sketch.getName().toLowerCase() + "_release_signed_aligned.apk");
 
     String[] args = {
-        zipalignPath, "-v", "-f", "4",
+        zipAlign.getAbsolutePath(), "-v", "-f", "4",
         signedPackage.getAbsolutePath(), alignedPackage.getAbsolutePath()
     };
 

src/processing/mode/android/AndroidSDK.java

@@ -322,6 +322,16 @@ public File getSupportLibrary() {
   } 
 
 
+  public File getZipAlignTool() {    
+    File[] files = buildTools.listFiles();
+    String name = Platform.isWindows() ? "zipalign.exe" : "zipalign";
+    for (File f: files) {
+      File z = new File(f, name);
+      if (z.exists()) return z;
+    }
+    return null;
+  }
+  
   static public File getHAXMInstallerFolder() {
     String sdkPrefsPath = Preferences.get("android.sdk.path");    
     File sdkPath = new File(sdkPrefsPath);
@@ -385,13 +395,10 @@ public static AndroidSDK load(boolean checkEnvSDK, Frame editor) throws IOExcept
     }    
 
     final String sdkEnvPath = Platform.getenv("ANDROID_SDK");
-    System.out.println("ANDROID_SDK: " + sdkEnvPath);
     if (sdkEnvPath != null) {
       try {
         final AndroidSDK androidSDK = new AndroidSDK(new File(sdkEnvPath));
 
-        System.out.println("ENVIRONMENT SDK CAN BE USED BY PROCESSING!!");
-        
         if (checkEnvSDK && editor != null) {
           // There is a valid SDK in the environment, but let's give the user
           // the option to not to use it. After this, we should go straight to