diff options
author | Yohann Roussel <yroussel@google.com> | 2015-08-21 14:56:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 14:56:15 +0000 |
commit | ae03b0076973d5ece5fd300748c29098955afec7 (patch) | |
tree | 1087570ce72cf982aee460efb8a56eb8625b53ce | |
parent | 6fe795a0dc629710ad27594ea837b234a9e8b289 (diff) | |
parent | 1396cdeb03bf25c33d461a734f6ce739c8c5bc32 (diff) | |
download | dalvik-ae03b0076973d5ece5fd300748c29098955afec7.tar.gz |
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-devandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-dr-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
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); |