commit 830acd878a1be63095bf710fecdd8d22f4f8449b
author Neil Fuller <nfuller@google.com> Wed Apr 03 14:05:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 14:05:15 2019 -0700
tree c91aa4942c58eefbb6bf4d229cbc3c486f3d6dfb
parent eb89189ff654b2b0ceed1f2165aab31b62ffa8e5
parent f1f3f02131d335b7ed20ab8347cbf4b8d5ca0c97

Minimal fix for merging jars with dir entries am: b7120f2b23 am: 752450080f
am: f1f3f02131

Change-Id: Ic9fbe1fed744031b97f6826c2750524c6e787bf6

src/vogar/android/AndroidSdk.java

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) {