commit d232cbc99d9452846bf00b710e6f2bac8f48ea2e
author Xavier Ducrohet <xav@google.com> Wed Dec 04 21:28:38 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 04 21:28:39 2013 +0000
tree 801b58b8b3f461d8b13d2472fa0b119ce28ce225
parent ff643a71289d972e66a61637947090c6dc950d14
parent 43ee5e97c443949aa68c529e249ed6e1e5057de5

Merge "Deactivate multi-thread in multi-dex mode" into klp-dev

dx/src/com/android/dx/command/dexer/Main.java

diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java
index ab6d2f7..8c77d89 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -1477,8 +1477,9 @@
             }
 
             if (multiDex && numThreads != 1) {
-                System.out.println(NUM_THREADS_OPTION + "is ignored when used with "
+                System.out.println(NUM_THREADS_OPTION + " is ignored when used with "
                     + MULTI_DEX_OPTION);
+                numThreads = 1;
             }
 
             if (multiDex && incremental) {