commit 0f6f6f415ba263e29ba8ee1294444ae383492a40
author Yohann Roussel <yroussel@google.com> Mon Aug 17 17:47:50 2015 +0200
committer The Android Automerger <android-build@android.com> Tue Sep 01 13:48:30 2015 -0700
tree 2f2b28f99cfbb0733c2046fd167731c648e1b76d
parent db3dd46645084223d191d0a24907097da22d38d1

Ensure deterministic multidex partitioning

This is done by sorting inputs before processing them.

Bug: 23305646

Change-Id: Ia55c481f4eb342bc925bc100299324ea470bf9a0

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 4a3d195..ac4d8c2 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -473,6 +473,7 @@
 
         anyFilesProcessed = false;
         String[] fileNames = args.fileNames;
+        Arrays.sort(fileNames);
 
         if (args.numThreads > 1) {
             threadPool = Executors.newFixedThreadPool(args.numThreads);
@@ -594,7 +595,7 @@
     private static void processOne(String pathname, FileNameFilter filter) {
         ClassPathOpener opener;
 
-        opener = new ClassPathOpener(pathname, false, filter,
+        opener = new ClassPathOpener(pathname, true, filter,
                 new ClassPathOpener.Consumer() {
 
             @Override