diff options
author | Neil Fuller <nfuller@google.com> | 2019-04-03 14:05:15 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-03 14:05:15 -0700 |
commit | 830acd878a1be63095bf710fecdd8d22f4f8449b (patch) | |
tree | c91aa4942c58eefbb6bf4d229cbc3c486f3d6dfb | |
parent | eb89189ff654b2b0ceed1f2165aab31b62ffa8e5 (diff) | |
parent | f1f3f02131d335b7ed20ab8347cbf4b8d5ca0c97 (diff) | |
download | vogar-android10-c2f2-release.tar.gz |
Minimal fix for merging jars with dir entries am: b7120f2b23 am: 752450080fandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: f1f3f02131
Change-Id: Ic9fbe1fed744031b97f6826c2750524c6e787bf6
-rw-r--r-- | src/vogar/android/AndroidSdk.java | 8 |
1 files changed, 8 insertions, 0 deletions
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.List; 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 @@ public class AndroidSdk { 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) { |