commit be967b814e0147ce8cbd20f301d26b41243166e9
author Nicolas Geoffray <ngeoffray@google.com> Fri Sep 11 22:13:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 11 22:13:59 2015 +0000
tree b1801f7cb1e5f59b547ea7c7535269c0990e6788
parent df244ae85f911408978b161e50b1bca18f09283b
parent dd0898e54fb76a7181eef4d6267dd6e5a0e9f999

am dd0898e5: Merge "Revert "Fixes incorrect update of DexMerger.main""

* commit 'dd0898e54fb76a7181eef4d6267dd6e5a0e9f999':
  Revert "Fixes incorrect update of DexMerger.main"

dx/src/com/android/dx/command/dexer/Main.java

diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java
index 6f981c7..7060222 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -517,6 +517,7 @@
 
         anyFilesProcessed = false;
         String[] fileNames = args.fileNames;
+        Arrays.sort(fileNames);
 
         // translate classes in parallel
         classTranslatorPool = new ThreadPoolExecutor(args.numThreads,
@@ -663,7 +664,7 @@
     private static void processOne(String pathname, FileNameFilter filter) {
         ClassPathOpener opener;
 
-        opener = new ClassPathOpener(pathname, false, filter, new FileBytesConsumer());
+        opener = new ClassPathOpener(pathname, true, filter, new FileBytesConsumer());
 
         if (opener.process()) {
           updateStatus(true);