diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-08-21 14:50:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 14:50:34 +0000 |
| commit | 1396cdeb03bf25c33d461a734f6ce739c8c5bc32 (patch) | |
| tree | e18196e10b6539a00359359335015a085ddb1260 | |
| parent | b8a003c7b1a7a733049e6013d73b821786e198d7 (diff) | |
| parent | 72353f83ff4057a64ff1e5ae3bc4b90de93e6171 (diff) | |
| download | android_dalvik-1396cdeb03bf25c33d461a734f6ce739c8c5bc32.tar.gz android_dalvik-1396cdeb03bf25c33d461a734f6ce739c8c5bc32.tar.bz2 android_dalvik-1396cdeb03bf25c33d461a734f6ce739c8c5bc32.zip | |
am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev
* commit '72353f83ff4057a64ff1e5ae3bc4b90de93e6171':
Ensure deterministic multidex partitioning
| -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 b9c6ec952..099264ca7 100644 --- a/dx/src/com/android/dx/command/dexer/Main.java +++ b/dx/src/com/android/dx/command/dexer/Main.java @@ -521,6 +521,7 @@ public class Main { anyFilesProcessed = false; String[] fileNames = args.fileNames; + Arrays.sort(fileNames); // translate classes in parallel classTranslatorPool = new ThreadPoolExecutor(args.numThreads, @@ -667,7 +668,7 @@ public class Main { 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); |