Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

dalvik: Commit

dalvik


Commit MetaInfo

Revision43ee5e97c443949aa68c529e249ed6e1e5057de5 (tree)
Time2013-12-03 22:00:27
AuthorBenoit Lamarche <benoitlamarche@goog...>
CommiterYohann Roussel

Log Message

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)

Change Summary

Incremental Difference

--- 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 {
14771477 }
14781478
14791479 if (multiDex && numThreads != 1) {
1480- System.out.println(NUM_THREADS_OPTION + "is ignored when used with "
1480+ System.out.println(NUM_THREADS_OPTION + " is ignored when used with "
14811481 + MULTI_DEX_OPTION);
1482+ numThreads = 1;
14821483 }
14831484
14841485 if (multiDex && incremental) {
Show on old repository browser