From e407fe839b49551fb06d03fe478f1496018ae24f Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 22 Apr 2015 07:21:02 -0500
Subject: [PATCH] Correctly rebuild /libs & /lib folder on [b]uild

---
 .../src/main/java/brut/androlib/Androlib.java | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
index 88f8f64a..fef7a463 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -285,6 +285,7 @@ public class Androlib {
         buildResources(appDir, (Map<String, Object>) meta.get("usesFramework"));
 
         buildLib(appDir);
+        buildLibs(appDir);
         buildCopyOriginalFiles(appDir);
         buildApk(appDir, outFile);
 
@@ -516,15 +517,24 @@ public class Androlib {
         }
     }
 
-    public void buildLib(File appDir)
-            throws AndrolibException {
-        File working = new File(appDir, "lib");
-        if (!working.exists()) {
+    public void buildLib(File appDir) throws AndrolibException {
+        buildLibrary(appDir, "lib");
+    }
+
+    public void buildLibs(File appDir) throws AndrolibException {
+        buildLibrary(appDir, "libs");
+    }
+
+    public void buildLibrary(File appDir, String folder) throws AndrolibException {
+        File working = new File(appDir, folder);
+
+        if (! working.exists()) {
             return;
         }
-        File stored = new File(appDir, APK_DIRNAME + "/lib");
+
+        File stored = new File(appDir, APK_DIRNAME + "/" + folder);
         if (apkOptions.forceBuildAll || isModified(working, stored)) {
-            LOGGER.info("Copying libs...");
+            LOGGER.info("Copying libs... (/" + folder + ")");
             try {
                 OS.rmdir(stored);
                 OS.cpdir(working, stored);