diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-04 03:14:29 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-04 03:14:29 +0000 |
| commit | 2d3425eb2dd03f313dcb03c8ebec69c99653fcc5 (patch) | |
| tree | c91aa4942c58eefbb6bf4d229cbc3c486f3d6dfb | |
| parent | b0cbc99c6bb5947603e281810b4537ae0eeb4512 (diff) | |
| parent | 830acd878a1be63095bf710fecdd8d22f4f8449b (diff) | |
| download | vogar-android10-s3-release.tar.gz | |
Snap for 5434517 from 830acd878a1be63095bf710fecdd8d22f4f8449b to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi
Change-Id: I3c472fde8d99f6599fa3d1e2bb3888ee9458cfd7
| -rw-r--r-- | src/vogar/ModeId.java | 2 | ||||
| -rw-r--r-- | src/vogar/android/AndroidSdk.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/vogar/ModeId.java b/src/vogar/ModeId.java index 718c5e0..e3b94c2 100644 --- a/src/vogar/ModeId.java +++ b/src/vogar/ModeId.java @@ -75,8 +75,8 @@ public enum ModeId { * generation. */ private static final String[] APP_JARS = new String[] { - "ext", "framework", + "ext", "telephony-common", "voip-common", "ims-common", 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) { |