Fixed error in ApkBuilderTask for jar files with resources

jar files specified with <jarfolder> are searched twice
for resources. The build fails when resources are found
the second time.

Change-Id: I4ce9028df7116587396aa67e0853eab34ba854fe

1 files changed, 0 insertions, 19 deletions

diff --git a/anttasks/src/com/android/ant/ApkBuilderTask.java b/anttasks/src/com/android/ant/ApkBuilderTask.java
index 5b3654f..958503b 100644
--- a/anttasks/src/com/android/ant/ApkBuilderTask.java
+++ b/anttasks/src/com/android/ant/ApkBuilderTask.java
@@ -349,25 +349,6 @@ public class ApkBuilderTask extends SingleDependencyTask {
                 apkBuilder.addSourceFolder(f);
             }
 
-            // now go through the list of jar folders.
-            for (Path pathList : mJarfolderList) {
-                for (String path : pathList.list()) {
-                    // it's ok if top level folders are missing
-                    File folder = new File(path);
-                    if (folder.isDirectory()) {
-                        String[] filenames = folder.list(new FilenameFilter() {
-                            public boolean accept(File dir, String name) {
-                                return PATTERN_JAR_EXT.matcher(name).matches();
-                            }
-                        });
-
-                        for (String filename : filenames) {
-                            apkBuilder.addResourcesFromJar(new File(folder, filename));
-                        }
-                    }
-                }
-            }
-
             // now go through the list of jar files.
             for (File f : jarFileList) {
                 apkBuilder.addResourcesFromJar(f);