diff options
| author | Xavier Ducrohet <xav@google.com> | 2013-12-04 21:28:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-04 21:28:39 +0000 |
| commit | d232cbc99d9452846bf00b710e6f2bac8f48ea2e (patch) | |
| tree | 801b58b8b3f461d8b13d2472fa0b119ce28ce225 | |
| parent | ff643a71289d972e66a61637947090c6dc950d14 (diff) | |
| parent | 43ee5e97c443949aa68c529e249ed6e1e5057de5 (diff) | |
| download | android_dalvik-d232cbc99d9452846bf00b710e6f2bac8f48ea2e.tar.gz android_dalvik-d232cbc99d9452846bf00b710e6f2bac8f48ea2e.tar.bz2 android_dalvik-d232cbc99d9452846bf00b710e6f2bac8f48ea2e.zip | |
Merge "Deactivate multi-thread in multi-dex mode" into klp-dev
| -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 ab6d2f788..8c77d894c 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 @@ public class Main { } 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) { |