diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2013-10-22 18:57:39 +0200 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2014-06-03 16:28:27 +0200 |
| commit | 439b6a953b0f14aa6c58e7b1404bc931b9320675 (patch) | |
| tree | db02b991e4b64b7c85cd8926cbfa69590b833eeb /dx | |
| parent | 498f8c3974c247f6ed9bc1d8b619b189c71a5d43 (diff) | |
Deactivate multi-thread in multi-dex mode
It should already have been the case, but it wasn't and it crashed.
Change-Id: Icb461d6e43ef2d113f59038d8c2327f3cfaff86c
(cherry picked from commit cf069ca52f2af9f70fcbeac99443f00401d43b4a)
Diffstat (limited to 'dx')
| -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 947bd4178..9f4a177d7 100644 --- a/dx/src/com/android/dx/command/dexer/Main.java +++ b/dx/src/com/android/dx/command/dexer/Main.java @@ -1474,8 +1474,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) { |