Minimal fix for merging jars with dir entries am: b7120f2b23 am: 752450080f
am: f1f3f02131
Change-Id: Ic9fbe1fed744031b97f6826c2750524c6e787bf6
diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java
index b19f404..f59c9b9 100644
--- a/src/vogar/android/AndroidSdk.java
+++ b/src/vogar/android/AndroidSdk.java
@@ -28,6 +28,7 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
+
import vogar.Classpath;
import vogar.Dexer;
import vogar.HostFileCache;
@@ -387,7 +388,14 @@
if (entry.getName().endsWith(".class")) {
continue;
}
+
+ // Skip directories as they can cause duplicates.
+ if (entry.isDirectory()) {
+ continue;
+ }
+
outputJar.putNextEntry(entry);
+
int length;
while ((length = inputJar.read(buffer)) >= 0) {
if (length > 0) {