diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2013-10-22 18:57:39 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2013-12-03 13:00:27 +0000 |
| commit | 43ee5e97c443949aa68c529e249ed6e1e5057de5 (patch) | |
| tree | 7bf9c0f8f2cd0cab6c7ef79db6c1abcbc8b4c1fc | |
| parent | 6e21232cf2bca0e73bd418413564cb140ab9ccbd (diff) | |
| download | android_dalvik-43ee5e97c443949aa68c529e249ed6e1e5057de5.tar.gz android_dalvik-43ee5e97c443949aa68c529e249ed6e1e5057de5.tar.bz2 android_dalvik-43ee5e97c443949aa68c529e249ed6e1e5057de5.zip | |
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)
| -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) { |