From b9436adffa4b0a6418a37059e78b0e8481dc7edf Mon Sep 17 00:00:00 2001 From: Claes Elgemark Date: Wed, 25 Jan 2012 15:38:41 +0100 Subject: Fixed error in ApkBuilderTask for jar files with resources jar files specified with are searched twice for resources. The build fails when resources are found the second time. Change-Id: I4ce9028df7116587396aa67e0853eab34ba854fe --- anttasks/src/com/android/ant/ApkBuilderTask.java | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'anttasks/src') 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); -- cgit v1.1