diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-08-17 17:47:50 +0200 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-09-01 13:48:30 -0700 |
| commit | 0f6f6f415ba263e29ba8ee1294444ae383492a40 (patch) | |
| tree | 2f2b28f99cfbb0733c2046fd167731c648e1b76d | |
| parent | db3dd46645084223d191d0a24907097da22d38d1 (diff) | |
| download | android_dalvik-0f6f6f415ba263e29ba8ee1294444ae383492a40.tar.gz android_dalvik-0f6f6f415ba263e29ba8ee1294444ae383492a40.tar.bz2 android_dalvik-0f6f6f415ba263e29ba8ee1294444ae383492a40.zip | |
Ensure deterministic multidex partitioning
This is done by sorting inputs before processing them.
Bug: 23305646
Change-Id: Ia55c481f4eb342bc925bc100299324ea470bf9a0
| -rw-r--r-- | dx/src/com/android/dx/command/dexer/Main.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java index 4a3d1952f..ac4d8c230 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 @@ public class Main { anyFilesProcessed = false; String[] fileNames = args.fileNames; + Arrays.sort(fileNames); if (args.numThreads > 1) { threadPool = Executors.newFixedThreadPool(args.numThreads); @@ -594,7 +595,7 @@ public class Main { 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 |