diff options
author | Yohann Roussel <yroussel@google.com> | 2015-08-21 14:57:18 +0200 |
---|---|---|
committer | Yohann Roussel <yroussel@google.com> | 2015-08-21 14:57:18 +0200 |
commit | 72353f83ff4057a64ff1e5ae3bc4b90de93e6171 (patch) | |
tree | 0e8708adb40d8ae98f063e9470e9540dc80eeadb | |
parent | 010ac9716931a47686e3f818910102a1231d32c0 (diff) | |
parent | ab01c96b3c21098dffbba03248f801486c76bdc7 (diff) | |
download | dalvik-72353f83ff4057a64ff1e5ae3bc4b90de93e6171.tar.gz |
resolved conflicts for merge of ab01c96b to lmp-mr1-dev
Change-Id: Ie70b72005a6d3df47adb0e5b1b21b9d7b99b8ab0
-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); |