Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

dalvik: Commit

dalvik


Commit MetaInfo

Revisiond232cbc99d9452846bf00b710e6f2bac8f48ea2e (tree)
Time2013-12-05 06:28:39
AuthorXavier Ducrohet <xav@goog...>
CommiterAndroid (Google) Code Review

Log Message

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

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