diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-08-17 17:47:50 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-08-19 11:20:27 +0200 |
| commit | ab01c96b3c21098dffbba03248f801486c76bdc7 (patch) | |
| tree | 93b14ee2119734e27ce32123f513af2f7d8d22bf | |
| parent | 8e88bab04f03edbbc74fb61b31a847c22106bfab (diff) | |
| download | android_dalvik-ab01c96b3c21098dffbba03248f801486c76bdc7.tar.gz android_dalvik-ab01c96b3c21098dffbba03248f801486c76bdc7.tar.bz2 android_dalvik-ab01c96b3c21098dffbba03248f801486c76bdc7.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 |