commit 2d3425eb2dd03f313dcb03c8ebec69c99653fcc5
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 04 03:14:29 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 04 03:14:29 2019 +0000
tree c91aa4942c58eefbb6bf4d229cbc3c486f3d6dfb
parent b0cbc99c6bb5947603e281810b4537ae0eeb4512
parent 830acd878a1be63095bf710fecdd8d22f4f8449b

Snap for 5434517 from 830acd878a1be63095bf710fecdd8d22f4f8449b to qt-release

Change-Id: I3c472fde8d99f6599fa3d1e2bb3888ee9458cfd7

src/vogar/ModeId.java

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 @@
      * generation.
      */
     private static final String[] APP_JARS = new String[] {
-            "ext",
             "framework",
+            "ext",
             "telephony-common",
             "voip-common",
             "ims-common",

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