diff options
author | Claes Elgemark <claes.elgemark@sonyericsson.com> | 2012-01-25 15:38:41 +0100 |
---|---|---|
committer | Zoran Jovanovic <zoran.jovanovic@sonyericsson.com> | 2012-01-25 15:44:03 +0100 |
commit | b9436adffa4b0a6418a37059e78b0e8481dc7edf (patch) | |
tree | 61c7e2075e821f71954bd8458db9ef6bc49f5357 | |
parent | 1ca78c7216b84d4f606c74a34d71409591c3af4b (diff) | |
download | sdk-b9436adffa4b0a6418a37059e78b0e8481dc7edf.zip sdk-b9436adffa4b0a6418a37059e78b0e8481dc7edf.tar.gz sdk-b9436adffa4b0a6418a37059e78b0e8481dc7edf.tar.bz2 |
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
-rw-r--r-- | anttasks/src/com/android/ant/ApkBuilderTask.java | 19 |
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); |